jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support standard mouse wheel event 

Mouse wheel event handling has now been standardised and has broad
support. Use this event rather than the older, non-standard ones.
At the same time fix up support for horisontal mouse wheel events.
This commit is contained in:
Pierre Ossman 2016-10-21 16:02:27 +02:00
parent a2495799af
commit ebb9086ae8
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
core/input/devices.js
View File

@ -291,18 +291,25 @@
var evt = (e ? e : window.event); var evt = (e ? e : window.event);
var pos = Util.getEventPosition(e, this._target, this._scale); var pos = Util.getEventPosition(e, this._target, this._scale);
var wheelData = evt.detail ? evt.detail * -1 : evt.wheelDelta / 40;
var bmask;
if (wheelData > 0) {
bmask = 1 << 3;
} else {
bmask = 1 << 4;
}
if (this._onMouseButton) { if (this._onMouseButton) {
this._onMouseButton(pos.x, pos.y, 1, bmask); if (evt.deltaX < 0) {
this._onMouseButton(pos.x, pos.y, 0, bmask); this._onMouseButton(pos.x, pos.y, 1, 1 << 5);
this._onMouseButton(pos.x, pos.y, 0, 1 << 5);
} else if (evt.deltaX > 0) {
this._onMouseButton(pos.x, pos.y, 1, 1 << 6);
this._onMouseButton(pos.x, pos.y, 0, 1 << 6);
}
if (evt.deltaY < 0) {
this._onMouseButton(pos.x, pos.y, 1, 1 << 3);
this._onMouseButton(pos.x, pos.y, 0, 1 << 3);
} else if (evt.deltaY > 0) {
this._onMouseButton(pos.x, pos.y, 1, 1 << 4);
this._onMouseButton(pos.x, pos.y, 0, 1 << 4);
}
} }
Util.stopEvent(e); Util.stopEvent(e);
return false; return false;
}, },
@ -356,8 +363,7 @@
window.addEventListener('mouseup', this._eventHandlers.mouseup); window.addEventListener('mouseup', this._eventHandlers.mouseup);
c.addEventListener('mouseup', this._eventHandlers.mouseup); c.addEventListener('mouseup', this._eventHandlers.mouseup);
c.addEventListener('mousemove', this._eventHandlers.mousemove); c.addEventListener('mousemove', this._eventHandlers.mousemove);
c.addEventListener((Util.Engine.gecko) ? 'DOMMouseScroll' : 'mousewheel', c.addEventListener('wheel', this._eventHandlers.mousewheel);
this._eventHandlers.mousewheel);
/* Work around right and middle click browser behaviors */ /* Work around right and middle click browser behaviors */
document.addEventListener('click', this._eventHandlers.mousedisable); document.addEventListener('click', this._eventHandlers.mousedisable);
@ -377,8 +383,7 @@
window.removeEventListener('mouseup', this._eventHandlers.mouseup); window.removeEventListener('mouseup', this._eventHandlers.mouseup);
c.removeEventListener('mouseup', this._eventHandlers.mouseup); c.removeEventListener('mouseup', this._eventHandlers.mouseup);
c.removeEventListener('mousemove', this._eventHandlers.mousemove); c.removeEventListener('mousemove', this._eventHandlers.mousemove);
c.removeEventListener((Util.Engine.gecko) ? 'DOMMouseScroll' : 'mousewheel', c.removeEventListener('wheel', this._eventHandlers.mousewheel);
this._eventHandlers.mousewheel);
/* Work around right and middle click browser behaviors */ /* Work around right and middle click browser behaviors */
document.removeEventListener('click', this._eventHandlers.mousedisable); document.removeEventListener('click', this._eventHandlers.mousedisable);