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

Fix drag with panHorizontal/panVertical set to false.

Browse Source
This commit is contained in:
Antoine Vandecreme 2016-03-20 11:01:26 -04:00
parent 43a9c14d3b
commit 2386900e29
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/viewer.js
View File

@ -2542,27 +2542,25 @@ function onCanvasDrag( event ) {
} }
function onCanvasDragEnd( event ) { function onCanvasDragEnd( event ) {
var gestureSettings; if (!event.preventDefaultAction && this.viewport) {
var gestureSettings = this.gestureSettingsByDeviceType(event.pointerType);
if ( !event.preventDefaultAction && this.viewport ) {
gestureSettings = this.gestureSettingsByDeviceType( event.pointerType );
if (gestureSettings.flickEnabled && if (gestureSettings.flickEnabled &&
event.speed >= gestureSettings.flickMinSpeed) { event.speed >= gestureSettings.flickMinSpeed) {
var amplitudeX = gestureSettings.flickMomentum * event.speed * var amplitudeX = 0;
Math.cos(event.direction); if (this.panHorizontal) {
var amplitudeY = gestureSettings.flickMomentum * event.speed * amplitudeX = gestureSettings.flickMomentum * event.speed *
Math.sin(event.direction); Math.cos(event.direction);
}
var amplitudeY = 0;
if (this.panVertical) {
amplitudeY = gestureSettings.flickMomentum * event.speed *
Math.sin(event.direction);
}
var center = this.viewport.pixelFromPoint( var center = this.viewport.pixelFromPoint(
this.viewport.getCenter(true)); this.viewport.getCenter(true));
var target = this.viewport.pointFromPixel( var target = this.viewport.pointFromPixel(
new $.Point(center.x - amplitudeX, center.y - amplitudeY)); new $.Point(center.x - amplitudeX, center.y - amplitudeY));
if( !this.panHorizontal ) { this.viewport.panTo(target, false);
target.x = center.x;
}
if( !this.panVertical ) {
target.y = center.y;
}
this.viewport.panTo( target, false );
} }
this.viewport.applyConstraints(); this.viewport.applyConstraints();
} }
@ -2581,7 +2579,7 @@ function onCanvasDragEnd( event ) {
* @property {Object} originalEvent - The original DOM event. * @property {Object} originalEvent - The original DOM event.
* @property {?Object} userData - Arbitrary subscriber-defined object. * @property {?Object} userData - Arbitrary subscriber-defined object.
*/ */
this.raiseEvent( 'canvas-drag-end', { this.raiseEvent('canvas-drag-end', {
tracker: event.eventSource, tracker: event.eventSource,
position: event.position, position: event.position,
speed: event.speed, speed: event.speed,