From b264d84385d50984af5eefb38e00352351982ef4 Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Mon, 30 Jan 2017 18:38:02 +0000 Subject: [PATCH] minimize git diff --- scripts/system/controllers/handControllerGrab.js | 6 +++--- scripts/system/edit.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js index 2efafa504d..86820c990a 100644 --- a/scripts/system/controllers/handControllerGrab.js +++ b/scripts/system/controllers/handControllerGrab.js @@ -1510,7 +1510,7 @@ function MyController(hand) { }; this.entityIsNearGrabbable = function(entityID, handPosition, maxDistance) { - + if (!this.entityIsGrabbable(entityID)) { return false; } @@ -2264,7 +2264,7 @@ function MyController(hand) { this.clearEquipHaptics(); this.shouldScale = false; - + Controller.triggerHapticPulse(HAPTIC_PULSE_STRENGTH, HAPTIC_PULSE_DURATION, this.hand); if (this.entityActivated) { @@ -2394,7 +2394,7 @@ function MyController(hand) { this.nearGrabbing = function(deltaTime, timestamp) { this.grabPointSphereOff(); - + if (this.state == STATE_NEAR_GRABBING && (!this.triggerClicked && this.secondaryReleased())) { this.callEntityMethodOnGrabbed("releaseGrab"); this.setState(STATE_OFF, "trigger released"); diff --git a/scripts/system/edit.js b/scripts/system/edit.js index 8f9697b060..40952e9de1 100644 --- a/scripts/system/edit.js +++ b/scripts/system/edit.js @@ -191,7 +191,7 @@ var toolBar = (function () { selectionManager.clearSelections(); entityListTool.sendUpdate(); selectionManager.setSelections([entityID]); - + return entityID; }