mirror of
https://github.com/piskelapp/piskel.git
synced 2023-08-10 21:12:52 +03:00
Compare commits
1 Commits
add-catch-
...
v0.8.3
Author | SHA1 | Date | |
---|---|---|---|
0cdfcfc94d |
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "piskel",
|
"name": "piskel",
|
||||||
"version": "0.9.0-SNAPSHOT",
|
"version": "0.8.3",
|
||||||
"description": "Pixel art editor",
|
"description": "Pixel art editor",
|
||||||
"author": "Julian Descottes <julian.descottes@gmail.com>",
|
"author": "Julian Descottes <julian.descottes@gmail.com>",
|
||||||
"contributors": [
|
"contributors": [
|
||||||
|
@ -238,13 +238,15 @@
|
|||||||
var evt = jQueryEvent.originalEvent;
|
var evt = jQueryEvent.originalEvent;
|
||||||
// Ratio between wheelDeltaY (mousewheel event) and deltaY (wheel event) is -40
|
// Ratio between wheelDeltaY (mousewheel event) and deltaY (wheel event) is -40
|
||||||
var delta;
|
var delta;
|
||||||
if (pskl.utils.UserAgent.isChrome) {
|
if (pskl.utils.UserAgent.isIE11) {
|
||||||
delta = evt.wheelDeltaY;
|
|
||||||
} else if (pskl.utils.UserAgent.isIE11) {
|
|
||||||
delta = evt.wheelDelta;
|
delta = evt.wheelDelta;
|
||||||
} else if (pskl.utils.UserAgent.isFirefox) {
|
} else if (pskl.utils.UserAgent.isFirefox) {
|
||||||
delta = -40 * evt.deltaY;
|
delta = -40 * evt.deltaY;
|
||||||
|
} else {
|
||||||
|
delta = evt.wheelDeltaY;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
delta = delta || 0;
|
||||||
var modifier = (delta / 120);
|
var modifier = (delta / 120);
|
||||||
|
|
||||||
if (pskl.utils.UserAgent.isMac ? evt.metaKey : evt.ctrlKey) {
|
if (pskl.utils.UserAgent.isMac ? evt.metaKey : evt.ctrlKey) {
|
||||||
|
Reference in New Issue
Block a user