Jelajahi Sumber

Allow the use of TransformControls simultaneously with other controls

by invoking event.preventDefault() and event.stopPropagation() only if the control is actually involved.
Sébastien Valette 10 tahun lalu
induk
melakukan
8003892bc5
1 mengubah file dengan 5 tambahan dan 5 penghapusan
  1. 5 5
      examples/js/controls/TransformControls.js

+ 5 - 5
examples/js/controls/TransformControls.js

@@ -726,8 +726,6 @@
 
 			if ( scope.object === undefined || _dragging === true ) return;
 
-			event.preventDefault();
-
 			var pointer = event.changedTouches ? event.changedTouches[ 0 ] : event;
 
 			var intersect = intersectObjects( pointer, scope.gizmo[_mode].pickers.children );
@@ -738,6 +736,8 @@
 
 				axis = intersect.object.name;
 
+				event.preventDefault();
+
 			}
 
 			if ( scope.axis !== axis ) {
@@ -754,9 +754,6 @@
 
 			if ( scope.object === undefined || _dragging === true ) return;
 
-			event.preventDefault();
-			event.stopPropagation();
-
 			var pointer = event.changedTouches ? event.changedTouches[ 0 ] : event;
 
 			if ( pointer.button === 0 || pointer.button === undefined ) {
@@ -765,6 +762,9 @@
 
 				if ( intersect ) {
 
+					event.preventDefault();
+					event.stopPropagation();
+
 					scope.dispatchEvent( mouseDownEvent );
 
 					scope.axis = intersect.object.name;