timeline: properly unsubscribe on destroy; resolve #848

katspaugh · Dec 3, 2016 · 0699fc7 · 0699fc7
1 parent bf370ed
commit 0699fc7
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/plugin/wavesurfer.timeline.js b/plugin/wavesurfer.timeline.js
@@ -6,7 +6,7 @@ WaveSurfer.Timeline = {
         var wavesurfer = this.wavesurfer = params.wavesurfer;
 
         if (!this.wavesurfer) {
-            throw Error('No WaveSurfer intance provided');
+            throw Error('No WaveSurfer instance provided');
         }
 
         var drawer = this.drawer = this.wavesurfer.drawer;
@@ -42,12 +42,19 @@ WaveSurfer.Timeline = {
         drawer.wrapper.addEventListener('scroll', function (e) {
             this.updateScroll(e);
         }.bind(this));
-        wavesurfer.on('redraw', this.render.bind(this));
-        wavesurfer.on('destroy', this.destroy.bind(this));
+
+        this._onRedraw = wavesurfer.on('redraw', this.render.bind(this));
+        this._onDestroy = wavesurfer.on('destroy', this.destroy.bind(this));
     },
 
     destroy: function () {
+        // Unsubscribe from internal wavesurfer events
+        this._onRedraw.un();
+        this._onDestroy.un();
+
+        // Unsubscribe from external timeline events
         this.unAll();
+
         if (this.wrapper && this.wrapper.parentNode) {
             this.wrapper.parentNode.removeChild(this.wrapper);
             this.wrapper = null;