mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-21 20:56:09 +03:00
Code Issues Projects Releases Wiki Activity

Revert "Add debounce of pan events"

Browse Source 
This reverts commit e836ffcc61.
This commit is contained in:
Christophe Avenel 2023-11-08 18:52:05 +01:00
parent e836ffcc61
commit c1038af37d
No known key found for this signature in database
2 changed files with 10 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openseadragon.js
View File

@ -141,9 +141,6 @@
* <strong>DEPRECATED</strong>. A relative path to load a DZI file from the server. * <strong>DEPRECATED</strong>. A relative path to load a DZI file from the server.
* Prefer the newer Options.tileSources. * Prefer the newer Options.tileSources.
* *
* @property {Boolean} [debouncePanEvents=false]
* Group multiple move events into one event. This is useful for debouncing.
*
* @property {String} [prefixUrl='/images/'] * @property {String} [prefixUrl='/images/']
* Prepends the prefixUrl to navImages paths, which is very useful * Prepends the prefixUrl to navImages paths, which is very useful
* since the default paths are rarely useful for production * since the default paths are rarely useful for production
@ -1373,7 +1370,6 @@ function OpenSeadragon( options ){
useCanvas: true, // Use canvas element for drawing if available useCanvas: true, // Use canvas element for drawing if available
tileRetryMax: 0, tileRetryMax: 0,
tileRetryDelay: 2500, tileRetryDelay: 2500,
debouncePanEvents: false,
//INTERFACE RESOURCE SETTINGS //INTERFACE RESOURCE SETTINGS
prefixUrl: "/images/", prefixUrl: "/images/",

47
src/viewer.js
View File

@ -3097,55 +3097,28 @@ function onCanvasDrag( event ) {
* @property {?Object} userData - Arbitrary subscriber-defined object. * @property {?Object} userData - Arbitrary subscriber-defined object.
*/ */
this.raiseEvent( 'canvas-drag', canvasDragEventArgs); this.raiseEvent( 'canvas-drag', canvasDragEventArgs);
if (this.debouncePanEvents) {
if (!this.dragEventCombined) { gestureSettings = this.gestureSettingsByDeviceType( event.pointerType );
this.dragEventCombined = canvasDragEventArgs;
this.dragEventCombined.timeStamp = canvasDragEventArgs.originalEvent.timeStamp;
}
else {
this.dragEventCombined.delta = this.dragEventCombined.delta.plus(canvasDragEventArgs.delta);
}
if (this.dragEventCombined.timeout) {
clearTimeout(this.dragEventCombined.timeout);
this.dragEventCombined.timeout = null;
}
if (canvasDragEventArgs.originalEvent.timeStamp - this.dragEventCombined.timeStamp > this.debouncePanEvents) {
canvasDragEventArgs = this.dragEventCombined;
this.dragEventCombined = null;
}
else {
this.dragEventCombined.timeout = setTimeout(function () {
// call onCanvasDrag with en event with delta.x and delat.y = 0
let newEvent = event;
newEvent.delta.x = 0;
newEvent.delta.y = 0;
this.dragEventCombined.timeStamp -= this.debouncePanEvents;
onCanvasDrag.call(this, newEvent);
}.bind(this), this.debouncePanEvents / 5);
return;
}
}
gestureSettings = this.gestureSettingsByDeviceType( canvasDragEventArgs.pointerType );
if(!canvasDragEventArgs.preventDefaultAction && this.viewport){ if(!canvasDragEventArgs.preventDefaultAction && this.viewport){
if (gestureSettings.dblClickDragToZoom && THIS[ this.hash ].draggingToZoom){ if (gestureSettings.dblClickDragToZoom && THIS[ this.hash ].draggingToZoom){
var factor = Math.pow( this.zoomPerDblClickDrag, canvasDragEventArgs.delta.y / 50); var factor = Math.pow( this.zoomPerDblClickDrag, event.delta.y / 50);
this.viewport.zoomBy(factor); this.viewport.zoomBy(factor);
} }
else if (gestureSettings.dragToPan && !THIS[ this.hash ].draggingToZoom) { else if (gestureSettings.dragToPan && !THIS[ this.hash ].draggingToZoom) {
if( !this.panHorizontal ){ if( !this.panHorizontal ){
canvasDragEventArgs.delta.x = 0; event.delta.x = 0;
} }
if( !this.panVertical ){ if( !this.panVertical ){
canvasDragEventArgs.delta.y = 0; event.delta.y = 0;
} }
if(this.viewport.flipped){ if(this.viewport.flipped){
canvasDragEventArgs.delta.x = -canvasDragEventArgs.delta.x; event.delta.x = -event.delta.x;
} }
if( this.constrainDuringPan ){ if( this.constrainDuringPan ){
var delta = this.viewport.deltaPointsFromPixels( canvasDragEventArgs.delta.negate() ); var delta = this.viewport.deltaPointsFromPixels( event.delta.negate() );
this.viewport.centerSpringX.target.value += delta.x; this.viewport.centerSpringX.target.value += delta.x;
this.viewport.centerSpringY.target.value += delta.y; this.viewport.centerSpringY.target.value += delta.y;
@ -3156,14 +3129,14 @@ function onCanvasDrag( event ) {
this.viewport.centerSpringY.target.value -= delta.y; this.viewport.centerSpringY.target.value -= delta.y;
if (constrainedBounds.xConstrained) { if (constrainedBounds.xConstrained) {
canvasDragEventArgs.delta.x = 0; event.delta.x = 0;
} }
if (constrainedBounds.yConstrained) { if (constrainedBounds.yConstrained) {
canvasDragEventArgs.delta.y = 0; event.delta.y = 0;
} }
} }
this.viewport.panBy( this.viewport.deltaPointsFromPixels( canvasDragEventArgs.delta.negate() ), gestureSettings.flickEnabled && !this.constrainDuringPan); this.viewport.panBy( this.viewport.deltaPointsFromPixels( event.delta.negate() ), gestureSettings.flickEnabled && !this.constrainDuringPan);
} }
} }