Live development bugfixes

src/LiveDevelopment/Agents/DOMAgent.js

@@ -209,7 +209,9 @@ define(function DOMAgent(require, exports, module) {
     // WebInspector Event: Page.frameNavigated
     function _onFrameNavigated(event, res) {
         // res = {frame}
-        exports.url = _cleanURL(res.frame.url);
+        if (!res.frame.parentId) {
+            exports.url = _cleanURL(res.frame.url);
+        }
     }
 
      // WebInspector Event: DOM.documentUpdated
@@ -291,6 +293,9 @@ define(function DOMAgent(require, exports, module) {
                 if (n.location > node.location) {
                     n.location += delta;
                 }
+                if (n.closeLocation !== undefined && n.closeLocation > node.location) {
+                    n.closeLocation += delta;
+                }
             });
         }
     }

src/LiveDevelopment/Agents/RemoteFunctions.js

@@ -38,6 +38,17 @@ function RemoteFunctions(experimental) {
     var HIGHLIGHT_CLASSNAME = "__brackets-ld-highlight",
         KEEP_ALIVE_TIMEOUT  = 3000;   // Keep alive timeout value, in milliseconds
 
+    // determine whether an event should be processed for Live Development
+    function _validEvent(event) {
+        if (navigator.platform.substr(0, 3) === "Mac") {
+            // Mac
+            return event.metaKey;
+        } else {
+            // Windows
+            return event.ctrlKey;
+        }
+    }
+
     // determine the color for a type
     function _typeColor(type, highlight) {
         switch (type) {
@@ -297,6 +308,12 @@ function RemoteFunctions(experimental) {
             for (i = 0; i < highlights.length; i++) {
                 body.removeChild(highlights[i]);
             }
+
+            if (this.trigger) {
+                for (i = 0; i < this.elements.length; i++) {
+                    _trigger(this.elements[i], "highlight", 0);
+                }
+            }
 
             this.elements = [];
         },
@@ -340,17 +357,15 @@ function RemoteFunctions(experimental) {
     /** Event Handlers ***********************************************************/
 
     function onMouseOver(event) {
-        if (!event.metaKey) {
-            return;
+        if (_validEvent(event)) {
+            _localHighlight.add(event.target, true);
         }
-        _localHighlight.add(event.target, true);
     }
 
     function onMouseOut(event) {
-        if (!event.metaKey) {
-            return;
+        if (_validEvent(event)) {
+            _localHighlight.clear();
         }
-        _localHighlight.clear();
     }
 
     function onMouseMove(event) {
@@ -359,20 +374,19 @@ function RemoteFunctions(experimental) {
     }
 
     function onClick(event) {
-        if (!event.metaKey) {
-            return;
-        }
-        event.preventDefault();
-        event.stopPropagation();
-        if (event.altKey) {
-            _toggleEditor(event.target);
-        } else {
-            _toggleMenu(event.target);
+        if (_validEvent(event)) {
+            event.preventDefault();
+            event.stopPropagation();
+            if (event.altKey) {
+                _toggleEditor(event.target);
+            } else {
+                _toggleMenu(event.target);
+            }
         }
     }
 
     function onKeyUp(event) {
-        if (_setup && !event.metaKey) {
+        if (_setup && !_validEvent(event)) {
             document.removeEventListener("keyup", onKeyUp);
             document.removeEventListener("mouseover", onMouseOver);
             document.removeEventListener("mouseout", onMouseOut);
@@ -385,7 +399,7 @@ function RemoteFunctions(experimental) {
     }
 
     function onKeyDown(event) {
-        if (!_setup && event.metaKey) {
+        if (!_setup && _validEvent(event)) {
             document.addEventListener("keyup", onKeyUp);
             document.addEventListener("mouseover", onMouseOver);
             document.addEventListener("mouseout", onMouseOut);