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

Remove return value from event handlers 

It's not used in modern event handlers.
This commit is contained in:
Samuel Mannehed 2017-02-16 10:52:18 +01:00
parent a0e3ec0ae6
commit 10d1ecc118
1 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
core/input/devices.js
View File

@ -69,44 +69,32 @@
}, },
_handleKeyDown: function (e) { _handleKeyDown: function (e) {
if (!this._focused) { return true; } if (!this._focused) { return; }
if (this._handler.keydown(e)) { if (this._handler.keydown(e)) {
// Suppress bubbling/default actions // Suppress bubbling/default actions
Util.stopEvent(e); Util.stopEvent(e);
return false;
} else { } else {
// Allow the event to bubble and become a keyPress event which // Allow the event to bubble and become a keyPress event which
// will have the character code translated // will have the character code translated
return true;
} }
}, },
_handleKeyPress: function (e) { _handleKeyPress: function (e) {
if (!this._focused) { return true; } if (!this._focused) { return; }
if (this._handler.keypress(e)) { if (this._handler.keypress(e)) {
// Suppress bubbling/default actions // Suppress bubbling/default actions
Util.stopEvent(e); Util.stopEvent(e);
return false;
} else {
// Allow the event to bubble and become a keyPress event which
// will have the character code translated
return true;
} }
}, },
_handleKeyUp: function (e) { _handleKeyUp: function (e) {
if (!this._focused) { return true; } if (!this._focused) { return; }
if (this._handler.keyup(e)) { if (this._handler.keyup(e)) {
// Suppress bubbling/default actions // Suppress bubbling/default actions
Util.stopEvent(e); Util.stopEvent(e);
return false;
} else {
// Allow the event to bubble and become a keyPress event which
// will have the character code translated
return true;
} }
}, },
@ -207,7 +195,7 @@
}, },
_handleMouseButton: function (e, down) { _handleMouseButton: function (e, down) {
if (!this._focused) { return true; } if (!this._focused) { return; }
if (this._notify) { if (this._notify) {
this._notify(e); this._notify(e);
@ -262,7 +250,6 @@
this._onMouseButton(pos.x, pos.y, down, bmask); this._onMouseButton(pos.x, pos.y, down, bmask);
} }
Util.stopEvent(e); Util.stopEvent(e);
return false;
}, },
_handleMouseDown: function (e) { _handleMouseDown: function (e) {
@ -278,7 +265,7 @@
}, },
_handleMouseWheel: function (e) { _handleMouseWheel: function (e) {
if (!this._focused) { return true; } if (!this._focused) { return; }
if (this._notify) { if (this._notify) {
this._notify(e); this._notify(e);
@ -305,11 +292,10 @@
} }
Util.stopEvent(e); Util.stopEvent(e);
return false;
}, },
_handleMouseMove: function (e) { _handleMouseMove: function (e) {
if (! this._focused) { return true; } if (! this._focused) { return; }
if (this._notify) { if (this._notify) {
this._notify(e); this._notify(e);
@ -320,11 +306,10 @@
this._onMouseMove(pos.x, pos.y); this._onMouseMove(pos.x, pos.y);
} }
Util.stopEvent(e); Util.stopEvent(e);
return false;
}, },
_handleMouseDisable: function (e) { _handleMouseDisable: function (e) {
if (!this._focused) { return true; } if (!this._focused) { return; }
/* /*
* Stop propagation if inside canvas area * Stop propagation if inside canvas area
@ -335,10 +320,7 @@
if (e.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 true;
}, },
// Return coordinates relative to target // Return coordinates relative to target