Skip to content

Commit

Permalink
TransformControls: Set touchAction instead of touchstart listener.
Browse files Browse the repository at this point in the history
  • Loading branch information
mrdoob committed Sep 1, 2020
1 parent 52fb198 commit fef0b7a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 20 deletions.
12 changes: 2 additions & 10 deletions examples/js/controls/TransformControls.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ THREE.TransformControls = function ( camera, domElement ) {

{

domElement.addEventListener( "touchstart", onTouchStart, false );
domElement.style.touchAction = 'none'; // disable touch scroll
domElement.addEventListener( "pointerdown", onPointerDown, false );
domElement.addEventListener( "pointermove", onPointerHover, false );
scope.domElement.ownerDocument.addEventListener( "pointerup", onPointerUp, false );
Expand All @@ -134,7 +134,7 @@ THREE.TransformControls = function ( camera, domElement ) {

this.dispose = function () {

domElement.removeEventListener( "touchstart", onTouchStart );
domElement.style.touchAction = '';
domElement.removeEventListener( "pointerdown", onPointerDown );
domElement.removeEventListener( "pointermove", onPointerHover );
scope.domElement.ownerDocument.removeEventListener( "pointermove", onPointerMove );
Expand Down Expand Up @@ -654,14 +654,6 @@ THREE.TransformControls = function ( camera, domElement ) {

}

function onTouchStart( event ) {

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

event.preventDefault(); // prevent scrolling

}

// TODO: deprecate

this.getMode = function () {
Expand Down
12 changes: 2 additions & 10 deletions examples/jsm/controls/TransformControls.js
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ var TransformControls = function ( camera, domElement ) {

{

domElement.addEventListener( "touchstart", onTouchStart, false );
domElement.style.touchAction = 'none'; // disable touch scroll
domElement.addEventListener( "pointerdown", onPointerDown, false );
domElement.addEventListener( "pointermove", onPointerHover, false );
scope.domElement.ownerDocument.addEventListener( "pointerup", onPointerUp, false );
Expand All @@ -155,7 +155,7 @@ var TransformControls = function ( camera, domElement ) {

this.dispose = function () {

domElement.removeEventListener( "touchstart", onTouchStart );
domElement.style.touchAction = '';
domElement.removeEventListener( "pointerdown", onPointerDown );
domElement.removeEventListener( "pointermove", onPointerHover );
scope.domElement.ownerDocument.removeEventListener( "pointermove", onPointerMove );
Expand Down Expand Up @@ -675,14 +675,6 @@ var TransformControls = function ( camera, domElement ) {

}

function onTouchStart( event ) {

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

event.preventDefault(); // prevent scrolling

}

// TODO: deprecate

this.getMode = function () {
Expand Down

0 comments on commit fef0b7a

Please sign in to comment.