Merge pull request #858 from fs-webdev/master

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

View File

@ -2847,7 +2847,10 @@ function onCanvasScroll( event ) {
} }
} }
else { else {
return false; // We are swallowing this event gestureSettings = this.gestureSettingsByDeviceType( event.pointerType );
if (gestureSettings && gestureSettings.scrollToZoom) {
return false; // We are swallowing this event
}
} }
} }