Skip to content

Commit 2a29bd2

Browse files
committed
Updated generated jsm files.
1 parent 822530b commit 2a29bd2

File tree

3 files changed

+247
-451
lines changed

3 files changed

+247
-451
lines changed

examples/jsm/controls/OrbitControls.js

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -546,32 +546,44 @@ var OrbitControls = function ( object, domElement ) {
546546

547547
function handleKeyDown( event ) {
548548

549-
//console.log( 'handleKeyDown' );
549+
// console.log( 'handleKeyDown' );
550+
551+
var needsUpdate = false;
550552

551553
switch ( event.keyCode ) {
552554

553555
case scope.keys.UP:
554556
pan( 0, scope.keyPanSpeed );
555-
scope.update();
557+
needsUpdate = true;
556558
break;
557559

558560
case scope.keys.BOTTOM:
559561
pan( 0, - scope.keyPanSpeed );
560-
scope.update();
562+
needsUpdate = true;
561563
break;
562564

563565
case scope.keys.LEFT:
564566
pan( scope.keyPanSpeed, 0 );
565-
scope.update();
567+
needsUpdate = true;
566568
break;
567569

568570
case scope.keys.RIGHT:
569571
pan( - scope.keyPanSpeed, 0 );
570-
scope.update();
572+
needsUpdate = true;
571573
break;
572574

573575
}
574576

577+
if ( needsUpdate ) {
578+
579+
// prevent the browser from scrolling on cursor keys
580+
event.preventDefault();
581+
582+
scope.update();
583+
584+
}
585+
586+
575587
}
576588

577589
function handleTouchStartRotate( event ) {
@@ -682,8 +694,15 @@ var OrbitControls = function ( object, domElement ) {
682694

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

697+
// Prevent the browser from scrolling.
698+
685699
event.preventDefault();
686700

701+
// Manually set the focus since calling preventDefault above
702+
// prevents the browser from setting it automatically.
703+
704+
scope.domElement.focus ? scope.domElement.focus() : window.focus();
705+
687706
switch ( event.button ) {
688707

689708
case scope.mouseButtons.LEFT:

examples/jsm/controls/TrackballControls.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ var TrackballControls = function ( object, domElement ) {
499499
function touchstart( event ) {
500500

501501
if ( _this.enabled === false ) return;
502-
502+
503503
event.preventDefault();
504504

505505
switch ( event.touches.length ) {

0 commit comments

Comments
 (0)