From 5f3eebe4e949c8bc9b17d8a54ea7e5d1ffb41b3b Mon Sep 17 00:00:00 2001
From: Grant Echols <gechols@ldschurch.org>
Date: Mon, 22 Feb 2016 11:59:37 -0700
Subject: [PATCH] Added check to see if we were zooming before swallowing the
 canvas scroll event.

---
 src/viewer.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/viewer.js b/src/viewer.js
index 136040d4..e18fa53e 100644
--- a/src/viewer.js
+++ b/src/viewer.js
@@ -2847,7 +2847,10 @@ function onCanvasScroll( event ) {
         }
     }
     else {
-        return false;   // We are swallowing this event
+        gestureSettings = this.gestureSettingsByDeviceType( event.pointerType );
+        if (gestureSettings && gestureSettings.scrollToZoom) {
+            return false;   // We are swallowing this event
+        }
     }
 }