From 0cdfcfc94d38b5e5f3011d2c8a114f1dad5477ed Mon Sep 17 00:00:00 2001 From: Julian Descottes Date: Sun, 23 Oct 2016 10:04:22 +0200 Subject: [PATCH] release 0.8.3: fix safari zoom issue --- package.json | 2 +- src/js/controller/DrawingController.js | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index db59a3a15..e38a05e53 100644 --- 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 ", "contributors": [ diff --git a/src/js/controller/DrawingController.js b/src/js/controller/DrawingController.js index f163e6d32..976beeff9 100644 --- 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) {