From 2c7cbb1bd9d8dab2e74e061f26004a7a4637b2a7 Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Fri, 27 Jan 2017 20:58:36 +0000 Subject: [PATCH] close tablet with mouse in HMD --- scripts/system/libraries/WebTablet.js | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/scripts/system/libraries/WebTablet.js b/scripts/system/libraries/WebTablet.js index 58fd18813f..a342597c2d 100644 --- a/scripts/system/libraries/WebTablet.js +++ b/scripts/system/libraries/WebTablet.js @@ -185,11 +185,9 @@ WebTablet = function (url, width, dpi, hand, clientOnly) { _this.mouseReleaseEvent(event); }; - if (!HMD.active) { - Controller.mousePressEvent.connect(this.myMousePressEvent); - Controller.mouseMoveEvent.connect(this.myMouseMoveEvent); - Controller.mouseReleaseEvent.connect(this.myMouseReleaseEvent); - } + Controller.mousePressEvent.connect(this.myMousePressEvent); + Controller.mouseMoveEvent.connect(this.myMouseMoveEvent); + Controller.mouseReleaseEvent.connect(this.myMouseReleaseEvent); this.dragging = false; this.initialLocalIntersectionPoint = {x: 0, y: 0, z: 0}; @@ -224,11 +222,10 @@ WebTablet.prototype.destroy = function () { Overlays.deleteOverlay(this.homeButtonEntity); HMD.displayModeChanged.disconnect(this.myOnHmdChanged); - if (!HMD.active) { - Controller.mousePressEvent.disconnect(this.myMousePressEvent); - Controller.mouseMoveEvent.disconnect(this.myMouseMoveEvent); - Controller.mouseReleaseEvent.disconnect(this.myMouseReleaseEvent); - } + + Controller.mousePressEvent.disconnect(this.myMousePressEvent); + Controller.mouseMoveEvent.disconnect(this.myMouseMoveEvent); + Controller.mouseReleaseEvent.disconnect(this.myMouseReleaseEvent); Window.geometryChanged.disconnect(this.myGeometryChanged); };