Skip to content

Commit

Permalink
Merge pull request #7492 from tschw/TrackballEvents
Browse files Browse the repository at this point in the history
Keep TrackballControls from consuming all events.
  • Loading branch information
mrdoob committed Oct 31, 2015
2 parents 7939105 + 348c706 commit 77d8093
Showing 1 changed file with 0 additions and 19 deletions.
19 changes: 0 additions & 19 deletions examples/js/controls/TrackballControls.js
Expand Up @@ -356,8 +356,6 @@ THREE.TrackballControls = function ( object, domElement ) {

if ( _this.enabled === false ) return;

window.removeEventListener( 'keydown', keydown );

_prevState = _state;

if ( _state !== STATE.NONE ) {
Expand Down Expand Up @@ -386,17 +384,12 @@ THREE.TrackballControls = function ( object, domElement ) {

_state = _prevState;

window.addEventListener( 'keydown', keydown, false );

}

function mousedown( event ) {

if ( _this.enabled === false ) return;

event.preventDefault();
event.stopPropagation();

if ( _state === STATE.NONE ) {

_state = event.button;
Expand Down Expand Up @@ -431,9 +424,6 @@ THREE.TrackballControls = function ( object, domElement ) {

if ( _this.enabled === false ) return;

event.preventDefault();
event.stopPropagation();

if ( _state === STATE.ROTATE && ! _this.noRotate ) {

_movePrev.copy( _moveCurr );
Expand All @@ -455,9 +445,6 @@ THREE.TrackballControls = function ( object, domElement ) {

if ( _this.enabled === false ) return;

event.preventDefault();
event.stopPropagation();

_state = STATE.NONE;

document.removeEventListener( 'mousemove', mousemove );
Expand All @@ -470,9 +457,6 @@ THREE.TrackballControls = function ( object, domElement ) {

if ( _this.enabled === false ) return;

event.preventDefault();
event.stopPropagation();

var delta = 0;

if ( event.wheelDelta ) {
Expand Down Expand Up @@ -529,9 +513,6 @@ THREE.TrackballControls = function ( object, domElement ) {

if ( _this.enabled === false ) return;

event.preventDefault();
event.stopPropagation();

switch ( event.touches.length ) {

case 1:
Expand Down

0 comments on commit 77d8093

Please sign in to comment.