浏览代码

Merge pull request #10324 from mrdoob/revert-10315-keyevents-on-dom-element

Revert "Set key event handler on control DOM element"
Mr.doob 8 年之前
父节点
当前提交
576c75dada

+ 4 - 4
examples/js/controls/FirstPersonControls.js

@@ -266,8 +266,8 @@ THREE.FirstPersonControls = function ( object, domElement ) {
 		this.domElement.removeEventListener( 'mousemove', _onMouseMove, false );
 		this.domElement.removeEventListener( 'mouseup', _onMouseUp, false );
 
-		this.domElement.removeEventListener( 'keydown', _onKeyDown, false );
-		this.domElement.removeEventListener( 'keyup', _onKeyUp, false );
+		window.removeEventListener( 'keydown', _onKeyDown, false );
+		window.removeEventListener( 'keyup', _onKeyUp, false );
 
 	};
 
@@ -282,8 +282,8 @@ THREE.FirstPersonControls = function ( object, domElement ) {
 	this.domElement.addEventListener( 'mousedown', _onMouseDown, false );
 	this.domElement.addEventListener( 'mouseup', _onMouseUp, false );
 
-	this.domElement.addEventListener( 'keydown', _onKeyDown, false );
-	this.domElement.addEventListener( 'keyup', _onKeyUp, false );
+	window.addEventListener( 'keydown', _onKeyDown, false );
+	window.addEventListener( 'keyup', _onKeyUp, false );
 
 	function bind( scope, fn ) {
 

+ 4 - 4
examples/js/controls/FlyControls.js

@@ -267,8 +267,8 @@ THREE.FlyControls = function ( object, domElement ) {
 		this.domElement.removeEventListener( 'mousemove', _mousemove, false );
 		this.domElement.removeEventListener( 'mouseup', _mouseup, false );
 
-		this.domElement.removeEventListener( 'keydown', _keydown, false );
-		this.domElement.removeEventListener( 'keyup', _keyup, false );
+		window.removeEventListener( 'keydown', _keydown, false );
+		window.removeEventListener( 'keyup', _keyup, false );
 
 	};
 
@@ -284,8 +284,8 @@ THREE.FlyControls = function ( object, domElement ) {
 	this.domElement.addEventListener( 'mousedown', _mousedown, false );
 	this.domElement.addEventListener( 'mouseup',   _mouseup, false );
 
-	this.domElement.addEventListener( 'keydown', _keydown, false );
-	this.domElement.addEventListener( 'keyup',   _keyup, false );
+	window.addEventListener( 'keydown', _keydown, false );
+	window.addEventListener( 'keyup',   _keyup, false );
 
 	this.updateMovementVector();
 	this.updateRotationVector();

+ 2 - 2
examples/js/controls/OrbitControls.js

@@ -221,7 +221,7 @@ THREE.OrbitControls = function ( object, domElement ) {
 		document.removeEventListener( 'mousemove', onMouseMove, false );
 		document.removeEventListener( 'mouseup', onMouseUp, false );
 
-		scope.domElement.removeEventListener( 'keydown', onKeyDown, false );
+		window.removeEventListener( 'keydown', onKeyDown, false );
 
 		//scope.dispatchEvent( { type: 'dispose' } ); // should this be added here?
 
@@ -879,7 +879,7 @@ THREE.OrbitControls = function ( object, domElement ) {
 	scope.domElement.addEventListener( 'touchend', onTouchEnd, false );
 	scope.domElement.addEventListener( 'touchmove', onTouchMove, false );
 
-	scope.domElement.addEventListener( 'keydown', onKeyDown, false );
+	window.addEventListener( 'keydown', onKeyDown, false );
 
 	// force an update at start
 

+ 6 - 6
examples/js/controls/OrthographicTrackballControls.js

@@ -379,7 +379,7 @@ THREE.OrthographicTrackballControls = function ( object, domElement ) {
 
 		if ( _this.enabled === false ) return;
 
-		_this.domElement.removeEventListener( 'keydown', keydown );
+		window.removeEventListener( 'keydown', keydown );
 
 		_prevState = _state;
 
@@ -409,7 +409,7 @@ THREE.OrthographicTrackballControls = function ( object, domElement ) {
 
 		_state = _prevState;
 
-		_this.domElement.addEventListener( 'keydown', keydown, false );
+		window.addEventListener( 'keydown', keydown, false );
 
 	}
 
@@ -609,8 +609,8 @@ THREE.OrthographicTrackballControls = function ( object, domElement ) {
 		document.removeEventListener( 'mousemove', mousemove, false );
 		document.removeEventListener( 'mouseup', mouseup, false );
 
-		this.domElement.removeEventListener( 'keydown', keydown, false );
-		this.domElement.removeEventListener( 'keyup', keyup, false );
+		window.removeEventListener( 'keydown', keydown, false );
+		window.removeEventListener( 'keyup', keyup, false );
 
 	};
 
@@ -622,8 +622,8 @@ THREE.OrthographicTrackballControls = function ( object, domElement ) {
 	this.domElement.addEventListener( 'touchend', touchend, false );
 	this.domElement.addEventListener( 'touchmove', touchmove, false );
 
-	this.domElement.addEventListener( 'keydown', keydown, false );
-	this.domElement.addEventListener( 'keyup', keyup, false );
+	window.addEventListener( 'keydown', keydown, false );
+	window.addEventListener( 'keyup', keyup, false );
 
 	this.handleResize();
 

+ 6 - 6
examples/js/controls/TrackballControls.js

@@ -356,7 +356,7 @@ THREE.TrackballControls = function ( object, domElement ) {
 
 		if ( _this.enabled === false ) return;
 
-		_this.domElement.removeEventListener( 'keydown', keydown );
+		window.removeEventListener( 'keydown', keydown );
 
 		_prevState = _state;
 
@@ -386,7 +386,7 @@ THREE.TrackballControls = function ( object, domElement ) {
 
 		_state = _prevState;
 
-		_this.domElement.addEventListener( 'keydown', keydown, false );
+		window.addEventListener( 'keydown', keydown, false );
 
 	}
 
@@ -596,8 +596,8 @@ THREE.TrackballControls = function ( object, domElement ) {
 		document.removeEventListener( 'mousemove', mousemove, false );
 		document.removeEventListener( 'mouseup', mouseup, false );
 
-		this.domElement.removeEventListener( 'keydown', keydown, false );
-		this.domElement.removeEventListener( 'keyup', keyup, false );
+		window.removeEventListener( 'keydown', keydown, false );
+		window.removeEventListener( 'keyup', keyup, false );
 
 	};
 
@@ -609,8 +609,8 @@ THREE.TrackballControls = function ( object, domElement ) {
 	this.domElement.addEventListener( 'touchend', touchend, false );
 	this.domElement.addEventListener( 'touchmove', touchmove, false );
 
-	this.domElement.addEventListener( 'keydown', keydown, false );
-	this.domElement.addEventListener( 'keyup', keyup, false );
+	window.addEventListener( 'keydown', keydown, false );
+	window.addEventListener( 'keyup', keyup, false );
 
 	this.handleResize();