release 0.8.3: fix safari zoom issue

juliandescottes · Oct 23, 2016 · 0cdfcfc · 0cdfcfc
1 parent 9c6871e
commit 0cdfcfc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "piskel",
-  "version": "0.9.0-SNAPSHOT",
+  "version": "0.8.3",
   "description": "Pixel art editor",
   "author": "Julian Descottes <julian.descottes@gmail.com>",
   "contributors": [

diff --git a/src/js/controller/DrawingController.js b/src/js/controller/DrawingController.js
@@ -238,13 +238,15 @@
     var evt = jQueryEvent.originalEvent;
     // Ratio between wheelDeltaY (mousewheel event) and deltaY (wheel event) is -40
     var delta;
-    if (pskl.utils.UserAgent.isChrome) {
-      delta = evt.wheelDeltaY;
-    } else if (pskl.utils.UserAgent.isIE11) {
+    if (pskl.utils.UserAgent.isIE11) {
       delta = evt.wheelDelta;
     } else if (pskl.utils.UserAgent.isFirefox) {
       delta = -40 * evt.deltaY;
+    } else {
+      delta = evt.wheelDeltaY;
     }
+
+    delta = delta || 0;
     var modifier = (delta / 120);
 
     if (pskl.utils.UserAgent.isMac ? evt.metaKey : evt.ctrlKey) {