Skip to content

Commit

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

{

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 +133,6 @@ THREE.TransformControls = function ( camera, domElement ) {

this.dispose = function () {

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

if ( ! scope.enabled ) return;

scope.domElement.style.touchAction = 'none'; // disable touch scroll
scope.domElement.ownerDocument.addEventListener( "pointermove", onPointerMove, false );

scope.pointerHover( getPointer( event ) );
Expand All @@ -648,6 +647,7 @@ THREE.TransformControls = function ( camera, domElement ) {

if ( ! scope.enabled ) return;

scope.domElement.style.touchAction = '';
scope.domElement.ownerDocument.removeEventListener( "pointermove", onPointerMove, false );

scope.pointerUp( getPointer( event ) );
Expand Down
4 changes: 2 additions & 2 deletions examples/jsm/controls/TransformControls.js
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ var TransformControls = function ( camera, domElement ) {

{

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 +154,6 @@ var TransformControls = function ( camera, domElement ) {

this.dispose = function () {

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

if ( ! scope.enabled ) return;

scope.domElement.style.touchAction = 'none'; // disable touch scroll
scope.domElement.ownerDocument.addEventListener( "pointermove", onPointerMove, false );

scope.pointerHover( getPointer( event ) );
Expand All @@ -669,6 +668,7 @@ var TransformControls = function ( camera, domElement ) {

if ( ! scope.enabled ) return;

scope.domElement.style.touchAction = '';
scope.domElement.ownerDocument.removeEventListener( "pointermove", onPointerMove, false );

scope.pointerUp( getPointer( event ) );
Expand Down

0 comments on commit 7f8b59f

Please sign in to comment.