fixed bug introduced by modifying the destroyer, making it impossible to return from add edge mode. #563

lib/network/mixins/ManipulationMixin.js

@@ -255,12 +255,12 @@ exports._createAddEdgeToolbar = function() {
   this._unselectAll(true);
   this.freezeSimulation = true;
 
-  var locale = this.constants.locales[this.constants.locale];
-
   if (this.boundFunction) {
     this.off('select', this.boundFunction);
   }
 
+  var locale = this.constants.locales[this.constants.locale];
+
   this._unselectAll();
   this.forceAppendSelection = false;
   this.blockConnectingEdgeSelection = true;
@@ -288,10 +288,10 @@ exports._createAddEdgeToolbar = function() {
   this.manipulationDiv.appendChild(this.manipulationDOM['descriptionSpan']);
 
   // bind the icon
-  var me = this; // we use me so we don't have to use bind(this). If we use bind, we cannot clean up after it.
-  this.manipulationDOM['backSpan'].onclick = me._createManipulatorBar;
+  this.manipulationDOM['backSpan'].onclick = this._createManipulatorBar.bind(this);
 
   // we use the boundFunction so we can reference it when we unbind it from the "select" event.
+  var me = this;
   this.boundFunction = me._handleConnect;
   this.on('select', this.boundFunction);