mirror/piskel
1
0
Fork 0
mirror of https://github.com/piskelapp/piskel.git synced 2023-08-10 21:12:52 +03:00
Code Issues Projects Releases Wiki Activity

Fix mousewheel event for IE11

Browse Source
This commit is contained in:
jdescottes 2015-01-24 00:00:08 +01:00
parent 5224c9ddd8
commit c7131678f8
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/js/controller/DrawingController.js
View File

@ -79,7 +79,7 @@
var body = $('body'); var body = $('body');
this.container.mousedown($.proxy(this.onMousedown_, this)); this.container.mousedown($.proxy(this.onMousedown_, this));
if (pskl.utils.UserAgent.isChrome) { if (pskl.utils.UserAgent.isChrome || pskl.utils.UserAgent.isIE11) {
this.container.on('mousewheel', $.proxy(this.onMousewheel_, this)); this.container.on('mousewheel', $.proxy(this.onMousewheel_, this));
} else { } else {
this.container.on('wheel', $.proxy(this.onMousewheel_, this)); this.container.on('wheel', $.proxy(this.onMousewheel_, this));
@ -222,7 +222,14 @@
ns.DrawingController.prototype.onMousewheel_ = function (jQueryEvent) { ns.DrawingController.prototype.onMousewheel_ = function (jQueryEvent) {
var event = jQueryEvent.originalEvent; var event = 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 = event.wheelDeltaY || (-40 * event.deltaY); var delta;
if (pskl.utils.UserAgent.isChrome) {
delta = event.wheelDeltaY;
} else if (pskl.utils.UserAgent.isIE11) {
delta = event.wheelDelta;
} else if (pskl.utils.UserAgent.isFirefox) {
delta = -40 * event.deltaY;
}
var modifier = Math.abs(delta/120); var modifier = Math.abs(delta/120);
if (delta > 0) { if (delta > 0) {
this.increaseZoom_(modifier); this.increaseZoom_(modifier);
@ -231,6 +238,16 @@
} }
}; };
ns.DrawingController.prototype.increaseZoom_ = function (zoomMultiplier) {
var step = (zoomMultiplier || 1) * this.getZoomStep_();
this.setZoom_(this.renderer.getZoom() + step);
};
ns.DrawingController.prototype.decreaseZoom_ = function (zoomMultiplier) {
var step = (zoomMultiplier || 1) * this.getZoomStep_();
this.setZoom_(this.renderer.getZoom() - step);
};
/** /**
* @private * @private
*/ */
@ -397,16 +414,6 @@
this.setZoom_(this.calculateZoom_()); this.setZoom_(this.calculateZoom_());
}; };
ns.DrawingController.prototype.increaseZoom_ = function (zoomMultiplier) {
var step = (zoomMultiplier || 1) * this.getZoomStep_();
this.setZoom_(this.renderer.getZoom() + step);
};
ns.DrawingController.prototype.decreaseZoom_ = function (zoomMultiplier) {
var step = (zoomMultiplier || 1) * this.getZoomStep_();
this.setZoom_(this.renderer.getZoom() - step);
};
ns.DrawingController.prototype.getZoomStep_ = function () { ns.DrawingController.prototype.getZoomStep_ = function () {
return this.calculateZoom_() / 10; return this.calculateZoom_() / 10;
}; };