From 698ccc6fb05a4b87b40da38699633f7838feccde Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Thu, 10 Sep 2015 13:48:36 -0700
Subject: [PATCH] don't change camera when edit.js is activated.  don't
 highlight entites I mouse-hover over.

---
 examples/edit.js                 | 7 ++-----
 examples/libraries/entityList.js | 3 ++-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/examples/edit.js b/examples/edit.js
index d778ff324d..55b745a4e1 100644
--- a/examples/edit.js
+++ b/examples/edit.js
@@ -260,7 +260,6 @@ var toolBar = (function () {
                     cameraManager.disable();
                 } else {
                     hasShownPropertiesTool = false;
-                    cameraManager.enable();
                     entityListTool.setVisible(true);
                     gridTool.setVisible(true);
                     grid.setEnabled(true);
@@ -670,15 +669,11 @@ function mouseMove(event) {
 
     lastMousePosition = { x: event.x, y: event.y };
 
-    highlightEntityUnderCursor(lastMousePosition, false);
     idleMouseTimerId = Script.setTimeout(handleIdleMouse, IDLE_MOUSE_TIMEOUT);
 }
 
 function handleIdleMouse() {
     idleMouseTimerId = null;
-    if (isActive) {
-        highlightEntityUnderCursor(lastMousePosition, true);
-    }
 }
 
 function highlightEntityUnderCursor(position, accurateRay) {
@@ -802,6 +797,7 @@ function mouseClickEvent(event) {
                 selectionDisplay.select(selectedEntityID, event);
 
                 if (Menu.isOptionChecked(MENU_AUTO_FOCUS_ON_SELECT)) {
+                    cameraManager.enable();
                     cameraManager.focus(selectionManager.worldPosition,
                                         selectionManager.worldDimensions,
                                         Menu.isOptionChecked(MENU_EASE_ON_FOCUS));
@@ -1142,6 +1138,7 @@ Controller.keyReleaseEvent.connect(function (event) {
     } else if (event.text == "f") {
         if (isActive) {
             if (selectionManager.hasSelection()) {
+                cameraManager.enable();
                 cameraManager.focus(selectionManager.worldPosition,
                                     selectionManager.worldDimensions,
                                     Menu.isOptionChecked(MENU_EASE_ON_FOCUS));
diff --git a/examples/libraries/entityList.js b/examples/libraries/entityList.js
index 66dc9f336f..3d6bf4d14f 100644
--- a/examples/libraries/entityList.js
+++ b/examples/libraries/entityList.js
@@ -49,7 +49,7 @@ EntityListTool = function(opts) {
 
         var selectedIDs = [];
         for (var i = 0; i < selectionManager.selections.length; i++) {
-            selectedIDs.push(selectionManager.selections[i].id); // ?
+            selectedIDs.push(selectionManager.selections[i].id);
         }
 
         var data = {
@@ -70,6 +70,7 @@ EntityListTool = function(opts) {
             }
             selectionManager.setSelections(entityIDs);
             if (data.focus) {
+                cameraManager.enable();
                 cameraManager.focus(selectionManager.worldPosition,
                                     selectionManager.worldDimensions,
                                     Menu.isOptionChecked(MENU_EASE_ON_FOCUS));