Browse Source

Revert "Keep TrackballControls from consuming all events."

This reverts commit 348c706a4679e52eaf1a0646e18636abfa9509e6.
tschw 9 years ago
parent
commit
3aa9619abc
1 changed files with 19 additions and 0 deletions
  1. 19 0
      examples/js/controls/TrackballControls.js

+ 19 - 0
examples/js/controls/TrackballControls.js

@@ -356,6 +356,8 @@ THREE.TrackballControls = function ( object, domElement ) {
 
 
 		if ( _this.enabled === false ) return;
 		if ( _this.enabled === false ) return;
 
 
+		window.removeEventListener( 'keydown', keydown );
+
 		_prevState = _state;
 		_prevState = _state;
 
 
 		if ( _state !== STATE.NONE ) {
 		if ( _state !== STATE.NONE ) {
@@ -384,12 +386,17 @@ THREE.TrackballControls = function ( object, domElement ) {
 
 
 		_state = _prevState;
 		_state = _prevState;
 
 
+		window.addEventListener( 'keydown', keydown, false );
+
 	}
 	}
 
 
 	function mousedown( event ) {
 	function mousedown( event ) {
 
 
 		if ( _this.enabled === false ) return;
 		if ( _this.enabled === false ) return;
 
 
+		event.preventDefault();
+		event.stopPropagation();
+
 		if ( _state === STATE.NONE ) {
 		if ( _state === STATE.NONE ) {
 
 
 			_state = event.button;
 			_state = event.button;
@@ -424,6 +431,9 @@ THREE.TrackballControls = function ( object, domElement ) {
 
 
 		if ( _this.enabled === false ) return;
 		if ( _this.enabled === false ) return;
 
 
+		event.preventDefault();
+		event.stopPropagation();
+
 		if ( _state === STATE.ROTATE && ! _this.noRotate ) {
 		if ( _state === STATE.ROTATE && ! _this.noRotate ) {
 
 
 			_movePrev.copy( _moveCurr );
 			_movePrev.copy( _moveCurr );
@@ -445,6 +455,9 @@ THREE.TrackballControls = function ( object, domElement ) {
 
 
 		if ( _this.enabled === false ) return;
 		if ( _this.enabled === false ) return;
 
 
+		event.preventDefault();
+		event.stopPropagation();
+
 		_state = STATE.NONE;
 		_state = STATE.NONE;
 
 
 		document.removeEventListener( 'mousemove', mousemove );
 		document.removeEventListener( 'mousemove', mousemove );
@@ -457,6 +470,9 @@ THREE.TrackballControls = function ( object, domElement ) {
 
 
 		if ( _this.enabled === false ) return;
 		if ( _this.enabled === false ) return;
 
 
+		event.preventDefault();
+		event.stopPropagation();
+
 		var delta = 0;
 		var delta = 0;
 
 
 		if ( event.wheelDelta ) {
 		if ( event.wheelDelta ) {
@@ -513,6 +529,9 @@ THREE.TrackballControls = function ( object, domElement ) {
 
 
 		if ( _this.enabled === false ) return;
 		if ( _this.enabled === false ) return;
 
 
+		event.preventDefault();
+		event.stopPropagation();
+
 		switch ( event.touches.length ) {
 		switch ( event.touches.length ) {
 
 
 			case 1:
 			case 1: