summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2020-06-10 12:56:50 +0200
committerSamuel Mannehed <samuel@cendio.se>2020-06-12 09:18:46 +0200
commit4a87038080ee8d9ad8eb9f276fc6acde6ef87467 (patch)
tree2e7d53511f2f49ea441e7f1438127c75ea35442c
parent77c32d164d19c42d0bb03992cf85899532d80de1 (diff)
downloadnovnc-4a87038080ee8d9ad8eb9f276fc6acde6ef87467.tar.gz
Remove very legacy mouse event handling
This is only needed on such ancient versions of Internet Explorer that it wouldn't satisfy our other requirements anyway.
-rw-r--r--core/input/mouse.js11
-rw-r--r--tests/test.mouse.js6
2 files changed, 4 insertions, 13 deletions
diff --git a/core/input/mouse.js b/core/input/mouse.js
index 4d01566..8c917d0 100644
--- a/core/input/mouse.js
+++ b/core/input/mouse.js
@@ -42,16 +42,7 @@ export default class Mouse {
this._updateMousePosition(e);
let pos = this._pos;
- let bmask;
- if (e.which) {
- /* everything except IE */
- bmask = 1 << e.button;
- } else {
- /* IE including 9 */
- bmask = (e.button & 0x1) + // Left
- (e.button & 0x2) * 2 + // Right
- (e.button & 0x4) / 2; // Middle
- }
+ let bmask = 1 << e.button;
Log.Debug("onmousebutton " + (down ? "down" : "up") +
", x: " + pos.x + ", y: " + pos.y + ", bmask: " + bmask);
diff --git a/tests/test.mouse.js b/tests/test.mouse.js
index 9e06ff2..13bd0c6 100644
--- a/tests/test.mouse.js
+++ b/tests/test.mouse.js
@@ -43,7 +43,7 @@ describe('Mouse Event Handling', function () {
expect(down).to.be.equal(1);
done();
};
- mouse._handleMouseDown(mouseevent('mousedown', { button: '0x01' }));
+ mouse._handleMouseDown(mouseevent('mousedown', { button: 0 }));
});
it('should decode mouseup events', function (done) {
let calls = 0;
@@ -55,8 +55,8 @@ describe('Mouse Event Handling', function () {
done();
}
};
- mouse._handleMouseDown(mouseevent('mousedown', { button: '0x01' }));
- mouse._handleMouseUp(mouseevent('mouseup', { button: '0x01' }));
+ mouse._handleMouseDown(mouseevent('mousedown', { button: 0 }));
+ mouse._handleMouseUp(mouseevent('mouseup', { button: 0 }));
});
it('should decode mousemove events', function (done) {
const mouse = new Mouse(target);