proxmox-mirrors/mirror_novnc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_novnc synced 2025-08-09 17:49:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Stop using window.event

Browse Source 
It's an old propriatary IE thing that isn't necessary.
This commit is contained in:
Samuel Mannehed 2017-02-16 10:48:56 +01:00
parent af1b2ae1e5
commit a0e3ec0ae6
2 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
core/input/devices.js
View File

@ -213,8 +213,7 @@
this._notify(e); this._notify(e);
} }
var evt = (e ? e : window.event); var pos = this._getMousePosition(e);
var pos = this._getMousePosition(evt);
var bmask; var bmask;
if (e.touches || e.changedTouches) { if (e.touches || e.changedTouches) {
@ -247,14 +246,14 @@
} }
bmask = this._touchButton; bmask = this._touchButton;
// If bmask is set // If bmask is set
} else if (evt.which) { } else if (e.which) {
/* everything except IE */ /* everything except IE */
bmask = 1 << evt.button; bmask = 1 << e.button;
} else { } else {
/* IE including 9 */ /* IE including 9 */
bmask = (evt.button & 0x1) + // Left bmask = (e.button & 0x1) + // Left
(evt.button & 0x2) * 2 + // Right (e.button & 0x2) * 2 + // Right
(evt.button & 0x4) / 2; // Middle (e.button & 0x4) / 2; // Middle
} }
if (this._onMouseButton) { if (this._onMouseButton) {
@ -285,22 +284,21 @@
this._notify(e); this._notify(e);
} }
var evt = (e ? e : window.event); var pos = this._getMousePosition(e);
var pos = this._getMousePosition(evt);
if (this._onMouseButton) { if (this._onMouseButton) {
if (evt.deltaX < 0) { if (e.deltaX < 0) {
this._onMouseButton(pos.x, pos.y, 1, 1 << 5); this._onMouseButton(pos.x, pos.y, 1, 1 << 5);
this._onMouseButton(pos.x, pos.y, 0, 1 << 5); this._onMouseButton(pos.x, pos.y, 0, 1 << 5);
} else if (evt.deltaX > 0) { } else if (e.deltaX > 0) {
this._onMouseButton(pos.x, pos.y, 1, 1 << 6); this._onMouseButton(pos.x, pos.y, 1, 1 << 6);
this._onMouseButton(pos.x, pos.y, 0, 1 << 6); this._onMouseButton(pos.x, pos.y, 0, 1 << 6);
} }
if (evt.deltaY < 0) { if (e.deltaY < 0) {
this._onMouseButton(pos.x, pos.y, 1, 1 << 3); this._onMouseButton(pos.x, pos.y, 1, 1 << 3);
this._onMouseButton(pos.x, pos.y, 0, 1 << 3); this._onMouseButton(pos.x, pos.y, 0, 1 << 3);
} else if (evt.deltaY > 0) { } else if (e.deltaY > 0) {
this._onMouseButton(pos.x, pos.y, 1, 1 << 4); this._onMouseButton(pos.x, pos.y, 1, 1 << 4);
this._onMouseButton(pos.x, pos.y, 0, 1 << 4); this._onMouseButton(pos.x, pos.y, 0, 1 << 4);
} }
@ -317,8 +315,7 @@
this._notify(e); this._notify(e);
} }
var evt = (e ? e : window.event); var pos = this._getMousePosition(e);
var pos = this._getMousePosition(evt);
if (this._onMouseMove) { if (this._onMouseMove) {
this._onMouseMove(pos.x, pos.y); this._onMouseMove(pos.x, pos.y);
} }
@ -329,14 +326,13 @@
_handleMouseDisable: function (e) { _handleMouseDisable: function (e) {
if (!this._focused) { return true; } if (!this._focused) { return true; }
var evt = (e ? e : window.event);
/* /*
* Stop propagation if inside canvas area * Stop propagation if inside canvas area
* Note: This is only needed for the 'click' event as it fails * Note: This is only needed for the 'click' event as it fails
* to fire properly for the target element so we have * to fire properly for the target element so we have
* to listen on the document element instead. * to listen on the document element instead.
*/ */
if (evt.target == this._target) { if (e.target == this._target) {
//Util.Debug("mouse event disabled"); //Util.Debug("mouse event disabled");
Util.stopEvent(e); Util.stopEvent(e);
return false; return false;

5
core/util.js
View File

@ -195,10 +195,7 @@ Util.decodeUTF8 = function (utf8string) {
*/ */
Util.getPointerEvent = function (e) { Util.getPointerEvent = function (e) {
var evt; return e.changedTouches ? e.changedTouches[0] : e.touches ? e.touches[0] : e;
evt = (e ? e : window.event);
evt = (evt.changedTouches ? evt.changedTouches[0] : evt.touches ? evt.touches[0] : evt);
return evt;
}; };
Util.stopEvent = function (e) { Util.stopEvent = function (e) {