Fix PolymerElements#215 by using _active

Skehmatics · Dec 19, 2016 · af8601b · af8601b
1 parent 8d94bac
commit af8601b
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/neon-animation-runner-behavior.html b/neon-animation-runner-behavior.html
@@ -32,7 +32,7 @@
             try {
               result = neonAnimation.configure(config);
               // Check if we have an Effect rather than an Animation
-              if (typeof result.cancel != 'function') { 
+              if (typeof result.cancel != 'function') {
                 result = document.timeline.play(result);
               }
             } catch (e) {
@@ -113,11 +113,13 @@
     /**
      * Cancels the currently running animations.
      */
-    cancelAnimation: function() {
-      for (var k in this._animations) {
-        this._animations[k].cancel();
+    cancelAnimation: function(cookie) {
+      for (var k in this._active) {
+        for (var i in this._active[k]){
+          this._active[k][i].animation.cancel();
+        }
+        delete this._active[k];
       }
-      this._animations = {};
     }
   };