trigger events with namespace

giniedp · Jul 2, 2018 · 2c902dc · 2c902dc
1 parent b479d1b
commit 2c902dc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/core/boot.ts b/src/core/boot.ts
@@ -136,13 +136,13 @@ export function boot(data: Data) {
   data.loading = true
   data.target
     .addClass('loading')
-    .trigger('onInit', data)
+    .trigger('onInit.' + namespace, data)
   Utils.preload({
     source: data.source,
     preloadCount: data.preloadCount,
     progress: (progress) => {
       data.progress = progress
-      data.target.trigger('onProgress', data)
+      data.target.trigger('onProgress.' + namespace, data)
     },
     complete: (images) => {
       data.images = images
@@ -154,10 +154,10 @@ export function boot(data: Data) {
       data.stage.show()
       data.target
         .removeClass('loading')
-        .trigger('onLoad', data)
-        .trigger('onFrame', data)
-        .trigger('onDraw', data)
-        .trigger('onComplete', data)
+        .trigger('onLoad.' + namespace, data)
+        .trigger('onFrame.' + namespace, data)
+        .trigger('onDraw.' + namespace, data)
+        .trigger('onComplete.' + namespace, data)
     }
   })
 }

diff --git a/src/core/playback.ts b/src/core/playback.ts
@@ -1,7 +1,7 @@
 import { clamp, wrap } from '../utils'
+import { namespace } from './constants'
 import { Data } from './models'
 import { getState } from './state'
-
 /**
  * Gets the playback state
  *
@@ -65,10 +65,10 @@ function updateBefore(data: Data) {
 function updateAfter(data: Data) {
   const state = getPlaybackState(data)
   if (state.lastFrame !== data.frame || state.lastLane !== data.lane) {
-    data.target.trigger('onFrameChanged', data)
+    data.target.trigger('onFrameChanged.' + namespace, data)
   }
-  data.target.trigger('onFrame', data)
-  data.target.trigger('onDraw', data)
+  data.target.trigger('onFrame.' + namespace, data)
+  data.target.trigger('onDraw.' + namespace, data)
 }
 
 /**