new version number

eyal0 · Jun 14, 2017 · 543bf7d · 543bf7d
1 parent 383be04
commit 543bf7d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/octoprint_slicer/static/js/octoprint_slicer.min.js b/octoprint_slicer/static/js/octoprint_slicer.min.js
@@ -10766,14 +10766,11 @@ TransformControls.prototype.constructor = TransformControls;
 // This set of controls performs orbiting, dollying (zooming), and panning.
 // Unlike TrackballControls, it maintains the "up" direction object.up (+Y by default).
 //
-//    Orbit - Default: left mouse / touch: one finger move
-//    Zoom - Default: middle mouse, or mousewheel / touch: two finger spread or squish
-//    Pan - Default right mouse, or arrow keys / touch: three finger swipe
+//    Orbit - left mouse / touch: one finger move
+//    Zoom - middle mouse, or mousewheel / touch: two finger spread or squish
+//    Pan - right mouse, or arrow keys / touch: three finger swipe
 
 function OrbitControls(object, domElement) {
-    var orbitBtn = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : MOUSE.LEFT;
-    var zoomBtn = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : MOUSE.MIDDLE;
-    var panBtn = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : MOUSE.RIGHT;
 
     this.object = object;
 
@@ -10833,7 +10830,7 @@ function OrbitControls(object, domElement) {
     this.keys = { LEFT: 37, UP: 38, RIGHT: 39, BOTTOM: 40 };
 
     // Mouse buttons
-    this.mouseButtons = { ORBIT: orbitBtn, ZOOM: zoomBtn, PAN: panBtn };
+    this.mouseButtons = { ORBIT: MOUSE.LEFT, ZOOM: MOUSE.MIDDLE, PAN: MOUSE.RIGHT };
 
     // for reset
     this.target0 = this.target.clone();
@@ -12136,16 +12133,14 @@ function PointerInteractions(domElement, camera, recursive) {
         if (pointerDepressed) {
 
             if (scope.draggedObject != obj) {
-                var prevObj = scope.draggedObject;
+                scope.dispatchEvent({ type: 'drag', previous: scope.draggedObject, current: obj });
                 scope.draggedObject = obj;
-                scope.dispatchEvent({ type: 'drag', previous: prevObj, current: obj });
             }
         } else {
 
             if (scope.hoveredObject != obj) {
-                var _prevObj = scope.hoveredObject;
+                scope.dispatchEvent({ type: 'hover', previous: scope.hoveredObject, current: obj });
                 scope.hoveredObject = obj;
-                scope.dispatchEvent({ type: 'hover', previous: _prevObj, current: obj });
             }
         }
     }
@@ -12160,9 +12155,8 @@ function PointerInteractions(domElement, camera, recursive) {
 
         var obj = insertedObject(event);
         if (scope.clickedObject != obj) {
-            var prevObj = scope.clickedObject;
+            scope.dispatchEvent({ type: 'click', previous: scope.clickedObject, current: obj });
             scope.clickedObject = obj;
-            scope.dispatchEvent({ type: 'click', previous: prevObj, current: obj });
         }
     }
 
@@ -12171,13 +12165,13 @@ function PointerInteractions(domElement, camera, recursive) {
         lastPointerEvent = "pointerout";
 
         if (pointerDepressed) {
-            var prevObj = scope.draggedObject;
+
+            scope.dispatchEvent({ type: 'drag', previous: scope.draggedObject, current: null });
             scope.draggedObject = null;
-            scope.dispatchEvent({ type: 'drag', previous: prevObj, current: null });
         } else {
-            var _prevObj2 = scope.hoveredObject;
+
+            scope.dispatchEvent({ type: 'hover', previous: scope.hoveredObject, current: null });
             scope.hoveredObject = null;
-            scope.dispatchEvent({ type: 'hover', previous: _prevObj2, current: null });
         }
     }
 

diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@
 plugin_name = "OctoPrint-Slicer"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "1.2.9"
+plugin_version = "1.2.9.20170614"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module