Merge 5929bb4 into e0c599d

zakandrewking · Apr 19, 2019 · 2461856 · 2461856
2 parents e0c599d + 5929bb4
commit 2461856
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 22 deletions.
diff --git a/src/Behavior.js b/src/Behavior.js
@@ -138,7 +138,7 @@ export default class Behavior {
     const selectionBackground = this.map.sel.selectAll('#canvas')
 
     if (this.rotationModeEnabled) {
-      this.map.callback_manager.run('start_rotation')
+      // this.map.callback_manager.run('start_rotation')
 
       const selectedNodes = this.map.getSelectedNodes()
       if (Object.keys(selectedNodes).length === 0) {
@@ -200,6 +200,7 @@ export default class Behavior {
       selectionBackground.call(this.rotationDrag)
       this.selectableDrag = this.rotationDrag
     } else {
+      // this.map.callback_manager.run('end_rotation')
       // turn off all listeners
       this.hideCenter()
       selectionNode.on('mousedown.center', null)

diff --git a/src/Builder.jsx b/src/Builder.jsx
@@ -737,27 +737,30 @@ class Builder {
    */
   _setUpModes (map, brush, zoomContainer) {
     // set up zoom+pan and brush modes
-    var wasEnabled = {}
-    map.callback_manager.set('start_rotation', function () {
-      wasEnabled.brush = brush.enabled
-      brush.toggle(false)
-      wasEnabled.zoom = zoomContainer.zoomOn
-      zoomContainer.togglePanDrag(false)
-      wasEnabled.selectableMousedown = map.behavior.selectableMousedown !== null
-      map.behavior.toggleSelectableClick(false)
-      wasEnabled.labelMouseover = map.behavior.labelMouseover !== null
-      wasEnabled.labelTouch = map.behavior.labelTouch !== null
-      map.behavior.toggleLabelMouseover(false)
-      map.behavior.toggleLabelTouch(false)
-    })
-    map.callback_manager.set('end_rotation', function () {
-      brush.toggle(wasEnabled.brush)
-      zoomContainer.togglePanDrag(wasEnabled.zoom)
-      map.behavior.toggleSelectableClick(wasEnabled.selectableMousedown)
-      map.behavior.toggleLabelMouseover(wasEnabled.labelMouseover)
-      map.behavior.toggleLabelTouch(wasEnabled.labelTouch)
-      wasEnabled = {}
-    })
+    // var wasEnabled = {}
+    // map.callback_manager.set('start_rotation', () => {
+    //   console.log('start_rotation')
+    //   wasEnabled.brush = brush.enabled
+    //   brush.toggle(false)
+    //   wasEnabled.zoom = zoomContainer.zoomOn
+    //   zoomContainer.togglePanDrag(false)
+    //   wasEnabled.selectableMousedown = map.behavior.selectableMousedown !== null
+    //   map.behavior.toggleSelectableClick(false)
+    //   wasEnabled.labelMouseover = map.behavior.labelMouseover !== map.behavior.emptyBehavior
+    //   console.log(wasEnabled)
+    //   wasEnabled.labelTouch = map.behavior.labelTouch !== null
+    //   map.behavior.toggleLabelMouseover(false)
+    //   map.behavior.toggleLabelTouch(false)
+    // })
+    // map.callback_manager.set('end_rotation', () => {
+    //   brush.toggle(wasEnabled.brush)
+    //   zoomContainer.togglePanDrag(wasEnabled.zoom)
+    //   map.behavior.toggleSelectableClick(wasEnabled.selectableMousedown)
+    //   console.log(wasEnabled.labelMouseover)
+    //   map.behavior.toggleLabelMouseover(wasEnabled.labelMouseover)
+    //   map.behavior.toggleLabelTouch(wasEnabled.labelTouch)
+    //   wasEnabled = {}
+    // })
   }
 
   /**