Fixed #236: Implemented kill renderers method

Also implemented the `kill` method for the existing captors.
jacomyal · Apr 2, 2014 · f2262f5 · f2262f5
1 parent 65f23cc
commit f2262f5
Show file tree

Hide file tree

Showing 5 changed files with 125 additions and 14 deletions.
diff --git a/src/captors/sigma.captors.mouse.js b/src/captors/sigma.captors.mouse.js
@@ -60,6 +60,23 @@
 
 
 
+    /**
+     * This method unbinds every handlers that makes the captor work.
+     */
+    this.kill = function() {
+      sigma.utils.unbindDoubleClick(_target, 'click');
+      _target.removeEventListener('DOMMouseScroll', _wheelHandler);
+      _target.removeEventListener('mousewheel', _wheelHandler);
+      _target.removeEventListener('mousemove', _moveHandler);
+      _target.removeEventListener('mousedown', _downHandler);
+      _target.removeEventListener('click', _clickHandler);
+      _target.removeEventListener('mouseout', _outHandler);
+      document.removeEventListener('mouseup', _upHandler);
+    };
+
+
+
+
     // MOUSE EVENTS:
     // *************
 

diff --git a/src/captors/sigma.captors.touch.js b/src/captors/sigma.captors.touch.js
@@ -58,11 +58,11 @@
     sigma.classes.dispatcher.extend(this);
 
     sigma.utils.doubleClick(_target, 'touchstart', _doubleTapHandler);
-    _target.addEventListener('touchstart', _handleStart);
-    _target.addEventListener('touchend', _handleLeave);
-    _target.addEventListener('touchcancel', _handleLeave);
-    _target.addEventListener('touchleave', _handleLeave);
-    _target.addEventListener('touchmove', _handleMove);
+    _target.addEventListener('touchstart', _handleStart, false);
+    _target.addEventListener('touchend', _handleLeave, false);
+    _target.addEventListener('touchcancel', _handleLeave, false);
+    _target.addEventListener('touchleave', _handleLeave, false);
+    _target.addEventListener('touchmove', _handleMove, false);
 
     function position(e) {
       var offset = sigma.utils.getOffset(_target);
@@ -75,6 +75,22 @@
 
 
 
+
+    /**
+     * This method unbinds every handlers that makes the captor work.
+     */
+    this.kill = function() {
+      sigma.utils.unbindDoubleClick(_target, 'touchstart');
+      _target.addEventListener('touchstart', _handleStart);
+      _target.addEventListener('touchend', _handleLeave);
+      _target.addEventListener('touchcancel', _handleLeave);
+      _target.addEventListener('touchleave', _handleLeave);
+      _target.addEventListener('touchmove', _handleMove);
+    };
+
+
+
+
     // TOUCH EVENTS:
     // *************
     /**

diff --git a/src/renderers/sigma.renderers.canvas.js b/src/renderers/sigma.renderers.canvas.js
@@ -96,9 +96,11 @@
     }
 
     // Bind resize:
-    window.addEventListener('resize', function() {
-      self.resize();
-    });
+    window.addEventListener(
+      'resize',
+      this.boundResize = this.resize.bind(this),
+      false
+    );
 
     // Deal with sigma events:
     sigma.misc.bindEvents.call(this, this.options.prefix);
@@ -362,6 +364,31 @@
     return this;
   };
 
+  /**
+   * This method kills contexts and other attributes.
+   */
+  sigma.renderers.canvas.prototype.kill = function() {
+    var k,
+        captor;
+
+    // Unbind resize:
+    window.removeEventListener('resize', this.boundResize);
+
+    // Kill captors:
+    while ((captor = this.captors.pop()))
+      captor.kill();
+    delete this.captors;
+
+    // Kill contexts:
+    for (k in this.domElements) {
+      this.domElements[k].parentNode.removeChild(this.domElements[k]);
+      delete this.domElements[k];
+      delete this.contexts[k];
+    }
+    delete this.domElements;
+    delete this.contexts;
+  };
+
 
 
 

diff --git a/src/renderers/sigma.renderers.webgl.js b/src/renderers/sigma.renderers.webgl.js
@@ -100,9 +100,11 @@
     }
 
     // Bind resize:
-    window.addEventListener('resize', function() {
-      _self.resize();
-    });
+    window.addEventListener(
+      'resize',
+      this.boundResize = this.resize.bind(this),
+      false
+    );
 
     // Deal with sigma events:
     sigma.misc.bindEvents.call(this, this.camera.prefix);
@@ -566,6 +568,31 @@
     return this;
   };
 
+  /**
+   * This method kills contexts and other attributes.
+   */
+  sigma.renderers.webgl.prototype.kill = function() {
+    var k,
+        captor;
+
+    // Unbind resize:
+    window.removeEventListener('resize', this.boundResize);
+
+    // Kill captors:
+    while ((captor = this.captors.pop()))
+      captor.kill();
+    delete this.captors;
+
+    // Kill contexts:
+    for (k in this.domElements) {
+      this.domElements[k].parentNode.removeChild(this.domElements[k]);
+      delete this.domElements[k];
+      delete this.contexts[k];
+    }
+    delete this.domElements;
+    delete this.contexts;
+  };
+
 
 
 

diff --git a/src/utils/sigma.utils.js b/src/utils/sigma.utils.js
@@ -241,9 +241,14 @@
    */
   sigma.utils.doubleClick = function(target, type, callback) {
     var clicks = 0,
-        self = this;
+        self = this,
+        handlers;
 
-    target.addEventListener(type, function(e) {
+    target._doubleClickHandler = target._doubleClickHandler || {};
+    target._doubleClickHandler[type] = target._doubleClickHandler[type] || [];
+    handlers = target._doubleClickHandler[type];
+
+    handlers.push(function(e) {
       clicks++;
 
       if (clicks === 2) {
@@ -254,7 +259,26 @@
           clicks = 0;
         }, sigma.settings.doubleClickTimeout);
       }
-    }, false);
+    });
+
+    target.addEventListener(type, handlers[handlers.length - 1], false);
+  };
+
+  /**
+   * Unbind simulated "double click" events.
+   *
+   * @param  {HTMLElement} target   The event target.
+   * @param  {string}      type     The event type.
+   */
+  sigma.utils.unbindDoubleClick = function(target, type) {
+    var handler,
+        handlers = (target._doubleClickHandler || {})[type] || [];
+
+    while ((handler = handlers.pop())) {
+      target.removeEventListener(type, handler);
+    }
+
+    delete (target._doubleClickHandler || {})[type];
   };