Prevent dispatcher from firing callbacks after removed

mapbox · Jul 12, 2016 · ff07754 · ff07754
1 parent 5c7774c
commit ff07754
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/js/data/buffer.js b/js/data/buffer.js
@@ -83,7 +83,7 @@ Buffer.prototype.setVertexAttribPointers = function(gl, program) {
  * @param gl The WebGL context
  */
 Buffer.prototype.destroy = function(gl) {
-    if (gl && this.buffer) {
+    if (this.buffer) {
         gl.deleteBuffer(this.buffer);
     }
 };

diff --git a/js/render/vertex_array_object.js b/js/render/vertex_array_object.js
@@ -88,7 +88,7 @@ VertexArrayObject.prototype.unbind = function(gl) {
 };
 
 VertexArrayObject.prototype.destroy = function(gl) {
-    var ext = gl && gl.extVertexArrayObject;
+    var ext = gl.extVertexArrayObject;
     if (ext && this.vao) {
         ext.deleteVertexArrayOES(this.vao);
         this.vao = null;

diff --git a/js/util/dispatcher.js b/js/util/dispatcher.js
@@ -36,6 +36,11 @@ function Dispatcher(length, parent) {
 
     this.worker = new Worker(workerBus);
     this.actor = new Actor(parentBus, parent);
+
+    this.remove = function() {
+        parentListeners.splice(0, parentListeners.length);
+        workerListeners.splice(0, workerListeners.length);
+    };
 }
 
 Dispatcher.prototype = {
@@ -45,9 +50,5 @@ Dispatcher.prototype = {
 
     send: function(type, data, callback, targetID, buffers) {
         this.actor.send(type, data, callback, buffers);
-    },
-
-    remove: function() {
-        // noop
     }
 };