Fix issue with callback executing after destroy

maxwellito · Apr 19, 2016 · 6de684c · 6de684c
1 parent bb58df2
commit 6de684c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/vivus.js b/src/vivus.js
@@ -570,6 +570,7 @@ Vivus.prototype.stop = function () {
  *
  */
 Vivus.prototype.destroy = function () {
+  this.stop();
   var i, path;
   for (i = 0; i < this.map.length; i++) {
     path = this.map[i];

diff --git a/test/unit/vivus.spec.js b/test/unit/vivus.spec.js
@@ -402,6 +402,22 @@ describe('Vivus', function () {
         myVivus.play();
       });
 
+      it('should stop animation if destroy has been called', function (done) {
+        var callbackSpy = jasmine.createSpy('spy');
+        myVivus = new Vivus(svgTag, {
+          type: 'oneByOne',
+          duration: 2,
+          start: 'autostart'
+        }, callbackSpy);
+
+        myVivus.destroy();
+
+        setTimeout(function () {
+          expect(callbackSpy.calls.count()).toEqual(0);
+          done();
+        }, 50);
+      });
+
       it('should stop the animation once it reaches currentFrame == 0', function (done) {
         myVivus = new Vivus(svgTag, {
           type: 'oneByOne',