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

Merge pull request #858 from fs-webdev/master

Browse Source 
Added check to see if we were zooming before swallowing the canvas sc…
This commit is contained in:
Ian Gilman 2016-02-23 09:08:58 -08:00
commit c1d9f6c5a8
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/viewer.js
View File

@ -2847,9 +2847,12 @@ function onCanvasScroll( event ) {
} }
} }
else { else {
gestureSettings = this.gestureSettingsByDeviceType( event.pointerType );
if (gestureSettings && gestureSettings.scrollToZoom) {
return false; // We are swallowing this event return false; // We are swallowing this event
} }
} }
}
function onContainerEnter( event ) { function onContainerEnter( event ) {
THIS[ this.hash ].mouseInside = true; THIS[ this.hash ].mouseInside = true;