Fix to make Ticker work properly with static interfaces (like TweenJS).

Signed-off-by: Grant Skinner <info@gskinner.com>
gskinner · Mar 30, 2012 · 3254149 · 3254149
1 parent d515659
commit 3254149
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/easeljs/utils/Ticker.js b/src/easeljs/utils/Ticker.js
@@ -417,8 +417,8 @@ var Ticker = function() {
 		for (var i=0; i<l; i++) {
 			var listener = listeners[i];
 			if (listener == null || (paused && pauseable[i])) { continue; }
-			if (listener instanceof Function) { listener(elapsedTime, paused); }
-			else if (listener.tick) { listener.tick(elapsedTime, paused); }
+			if (listener.tick) { listener.tick(elapsedTime, paused); }
+			else if (listener instanceof Function) { listener(elapsedTime, paused); }
 		}
 
 		Ticker._tickTimes.unshift(Ticker._getTime()-time);