DevTools: properly inject elements panel context menu items.

Source/devtools/front_end/elements/ElementsPanel.js

 /*
  * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 39 matching lines @@
     var stackElement = this._searchableView.element;
 
     this.contentElement = stackElement.createChild("div");
     this.contentElement.id = "elements-content";
     this.contentElement.classList.add("outline-disclosure");
     this.contentElement.classList.add("source-code");
     if (!WebInspector.settings.domWordWrap.get())
         this.contentElement.classList.add("nowrap");
     WebInspector.settings.domWordWrap.addChangeListener(this._domWordWrapSettingChanged.bind(this));
 
-    this.contentElement.addEventListener("contextmenu", this._contextMenuEventFired.bind(this), true);
     this._splitView.sidebarElement().addEventListener("contextmenu", this._sidebarContextMenuEventFired.bind(this), false);
 
     var crumbsContainer = stackElement.createChild("div");
     crumbsContainer.id = "elements-crumbs";
     this.crumbsElement = crumbsContainer.createChild("div", "crumbs");
     this.crumbsElement.addEventListener("mousemove", this._mouseMovedInCrumbs.bind(this), false);
     this.crumbsElement.addEventListener("mouseout", this._mouseMovedOutOfCrumbs.bind(this), false);
 
     this.sidebarPanes = {};
     this.sidebarPanes.platformFonts = new WebInspector.PlatformFontsSidebarPane();
@@ skipping 52 matching lines @@
     {
         for (var i = 0; i < this._treeOutlines.length; ++i)
             this._treeOutlines[i].setPickNodeMode(false);
     },
 
     /**
      * @param {!WebInspector.Target} target
      */
     targetAdded: function(target)
     {
-        var treeOutline = new WebInspector.ElementsTreeOutline(target, true, true, this._populateContextMenu.bind(this), this._setPseudoClassForNode.bind(this));
+        var treeOutline = new WebInspector.ElementsTreeOutline(target, true, true, this._setPseudoClassForNode.bind(this));
         treeOutline.wireToDOMModel();
         treeOutline.addEventListener(WebInspector.ElementsTreeOutline.Events.SelectedNodeChanged, this._selectedNodeChanged, this);
         treeOutline.addEventListener(WebInspector.ElementsTreeOutline.Events.NodePicked, this._onNodePicked, this);
         treeOutline.addEventListener(WebInspector.ElementsTreeOutline.Events.ElementsTreeUpdated, this._updateBreadcrumbIfNeeded, this);
         this._treeOutlines.push(treeOutline);
         this._targetToTreeOutline.set(target, treeOutline);
 
         // Perform attach if necessary.
         if (this.isShowing())
             this.wasShown();
@@ skipping 300 matching lines @@
             this._searchableView.updateSearchMatchesCount(this._searchResults.length);
             if (!this._searchResults.length)
                 return;
             this._currentSearchResultIndex = -1;
 
             if (shouldJump)
                 this._jumpToSearchResult(jumpBackwards ? -1 : 0);
         }
     },
 
-    _contextMenuEventFired: function(event)
-    {
-        if (this.sidebarPanes.styles.isEditingSelector())
-            return;
-        var contextMenu = new WebInspector.ContextMenu(event);
-        for (var i = 0; i < this._treeOutlines.length; ++i)
-            this._treeOutlines[i].populateContextMenu(contextMenu, event);
-        contextMenu.show();
-    },
-
     _domWordWrapSettingChanged: function(event)
     {
         if (event.data)
             this.contentElement.classList.remove("nowrap");
         else
             this.contentElement.classList.add("nowrap");
 
         var selectedNode = this.selectedDOMNode();
         if (!selectedNode)
             return;
 
         var treeElement = this._treeElementForNode(selectedNode);
         if (treeElement)
             treeElement.updateSelection(); // Recalculate selection highlight dimensions.
     },
 
     switchToAndFocus: function(node)
     {
         // Reset search restore.
         this._searchableView.cancelSearch();
         WebInspector.inspectorView.setCurrentPanel(this);
         this.selectDOMNode(node, true);
     },
 
-    _populateContextMenu: function(contextMenu, node)
-    {
-        // Add debbuging-related actions
-        contextMenu.appendSeparator();
-        var pane = WebInspector.domBreakpointsSidebarPane;
-        pane.populateNodeContextMenu(node, contextMenu);
-    },
-
     /**
      * @param {!Element} element
      * @param {!Event} event
      * @return {!Element|!AnchorBox|undefined}
      */
     _getPopoverAnchor: function(element, event)
     {
         var anchor = element.enclosingNodeOrSelfWithClass("webkit-html-resource-link");
         if (!anchor || !anchor.href)
             return;
@@ skipping 779 matching lines @@
      * @param {!WebInspector.ContextMenu} contextMenu
      * @param {!Object} object
      */
     appendApplicableItems: function(event, contextMenu, object)
     {
         if (!(object instanceof WebInspector.RemoteObject && (/** @type {!WebInspector.RemoteObject} */ (object)).isNode())
             && !(object instanceof WebInspector.DOMNode)
             && !(object instanceof WebInspector.DeferredDOMNode)) {
             return;
         }
+
+        // Add debbuging-related actions
+        if (object instanceof WebInspector.DOMNode) {
+            contextMenu.appendSeparator();
+            WebInspector.domBreakpointsSidebarPane.populateNodeContextMenu(object, contextMenu);
+        }
+
         // Skip adding "Reveal..." menu item for our own tree outline.
         if (this.element.isAncestor(/** @type {!Node} */ (event.target)))
             return;
         var commandCallback = WebInspector.Revealer.reveal.bind(WebInspector.Revealer, object);
+

[sergeyv, 2014/09/24 16:17:29]

extra line

[pfeldman, 2014/09/24 16:23:13]

Acknowledged.

         contextMenu.appendItem(WebInspector.useLowerCaseMenuTitles() ? "Reveal in Elements panel" : "Reveal in Elements Panel", commandCallback);
     },
 
     _sidebarContextMenuEventFired: function(event)
     {
         var contextMenu = new WebInspector.ContextMenu(event);
         contextMenu.show();
     },
 
     _dockSideChanged: function()
@@ skipping 305 matching lines @@
         /**
          * @suppressReceiverCheck
          * @this {Element}
          */
         function parentElement()
         {
             return this.parentElement;
         }
     }
 }