Changeset 91179 in webkit

Timestamp:

Jul 18, 2011, 6:18:08 AM (14 years ago)

Author:

pfeldman@chromium.org

Message:

Web Inspector: "Reveal in Elements Panel" is broken.
​https://bugs.webkit.org/show_bug.cgi?id=64688

Reviewed by Yury Semikhatsky.

• inspector/front-end/ElementsTreeOutline.js:

(WebInspector.ElementsTreeOutline):
(WebInspector.ElementsTreeOutline.prototype._contextMenuEventFired.focusElement):
(WebInspector.ElementsTreeOutline.prototype._contextMenuEventFired):
(WebInspector.ElementsTreeOutline.prototype.populateContextMenu):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/ElementsTreeOutline.js (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-18  Pavel Feldman  <pfeldman@google.com>
+
+        Web Inspector: "Reveal in Elements Panel" is broken.
+        https://bugs.webkit.org/show_bug.cgi?id=64688
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/front-end/ElementsTreeOutline.js:
+        (WebInspector.ElementsTreeOutline):
+        (WebInspector.ElementsTreeOutline.prototype._contextMenuEventFired.focusElement):
+        (WebInspector.ElementsTreeOutline.prototype._contextMenuEventFired):
+        (WebInspector.ElementsTreeOutline.prototype.populateContextMenu):
+
 2011-07-18  Julien Chaffraix  <jchaffraix@webkit.org>
 

trunk/Source/WebCore/inspector/front-end/ElementsTreeOutline.js

@@ -47 +47 @@
     this.rootDOMNode = null;
     this.focusedDOMNode = null;
+    this.element.addEventListener("contextmenu", this._contextMenuEventFired.bind(this), true);
 }
 
@@ -380 +381 @@
     },
 
+    _contextMenuEventFired: function(event)
+    {
+        if (!this.showInElementsPanelEnabled)
+            return;
+
+        var treeElement = this._treeElementFromEvent(event);
+        if (!treeElement)
+            return;
+
+        function focusElement()
+        {
+            WebInspector.panels.elements.switchToAndFocus(treeElement.representedObject);
+        }
+        var contextMenu = new WebInspector.ContextMenu();
+        contextMenu.appendItem(WebInspector.UIString("Reveal in Elements Panel"), focusElement.bind(this));
+        contextMenu.show(event);
+    },
+
     populateContextMenu: function(contextMenu, event)
     {
@@ -387 +406 @@
 
         var populated;
-        if (this.showInElementsPanelEnabled) {
-            function focusElement()
-            {
-                WebInspector.panels.elements.switchToAndFocus(treeElement.representedObject);
-            }
-            contextMenu.appendItem(WebInspector.UIString("Reveal in Elements Panel"), focusElement.bind(this));
+        var href = event.target.enclosingNodeOrSelfWithClass("webkit-html-resource-link") || event.target.enclosingNodeOrSelfWithClass("webkit-html-external-link");
+        var tag = event.target.enclosingNodeOrSelfWithClass("webkit-html-tag");
+        var textNode = event.target.enclosingNodeOrSelfWithClass("webkit-html-text-node");
+        if (href)
+            populated = WebInspector.panels.elements.populateHrefContextMenu(contextMenu, event, href);
+        if (tag && treeElement._populateTagContextMenu) {
+            if (populated)
+                contextMenu.appendSeparator();
+            treeElement._populateTagContextMenu(contextMenu, event);
             populated = true;
-        } else {
-            var href = event.target.enclosingNodeOrSelfWithClass("webkit-html-resource-link") || event.target.enclosingNodeOrSelfWithClass("webkit-html-external-link");
-            var tag = event.target.enclosingNodeOrSelfWithClass("webkit-html-tag");
-            var textNode = event.target.enclosingNodeOrSelfWithClass("webkit-html-text-node");
-            if (href)
-                populated = WebInspector.panels.elements.populateHrefContextMenu(contextMenu, event, href);
-            if (tag && treeElement._populateTagContextMenu) {
-                if (populated)
-                    contextMenu.appendSeparator();
-                treeElement._populateTagContextMenu(contextMenu, event);
-                populated = true;
-            } else if (textNode && treeElement._populateTextContextMenu) {
-                if (populated)
-                    contextMenu.appendSeparator();
-                treeElement._populateTextContextMenu(contextMenu, textNode);
-                populated = true;
-            }
+        } else if (textNode && treeElement._populateTextContextMenu) {
+            if (populated)
+                contextMenu.appendSeparator();
+            treeElement._populateTextContextMenu(contextMenu, textNode);
+            populated = true;
         }