Changeset 254485 in webkit

Timestamp:

Jan 13, 2020 7:44:30 PM (4 years ago)

Author:

Devin Rousso

Message:

Web Inspector: "Enable Local Override" and "Delete Local Override" are displayed twice in the contextual menu
​https://bugs.webkit.org/show_bug.cgi?id=206184
<rdar://problem/58409880>

Reviewed by Brian Burg.

• UserInterface/Views/ContextMenuUtilities.js:

(WI.appendContextMenuItemsForSourceCode):

• UserInterface/Views/LocalResourceOverrideTreeElement.js:

(WI.LocalResourceOverrideTreeElement.prototype.populateContextMenu):
Add an expando flag that can be set by WI.LocalResourceOverrideTreeElement to ensure that
the local override context menu items aren't added again by WI.ResourceTreeElement.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/ContextMenuUtilities.js (modified) (1 diff)
• UserInterface/Views/LocalResourceOverrideTreeElement.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2020-01-13  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: "Enable Local Override" and "Delete Local Override" are displayed twice in the contextual menu
+        https://bugs.webkit.org/show_bug.cgi?id=206184
+        <rdar://problem/58409880>
+
+        Reviewed by Brian Burg.
+
+        * UserInterface/Views/ContextMenuUtilities.js:
+        (WI.appendContextMenuItemsForSourceCode):
+        * UserInterface/Views/LocalResourceOverrideTreeElement.js:
+        (WI.LocalResourceOverrideTreeElement.prototype.populateContextMenu):
+        Add an expando flag  that can be set by `WI.LocalResourceOverrideTreeElement` to ensure that
+        the local override context menu items aren't added again by `WI.ResourceTreeElement`.
+
 2020-01-09  Nikita Vasilyev  <nvasilyev@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js

@@ -71 +71 @@
         return;
 
-    if (WI.NetworkManager.supportsLocalResourceOverrides()) {
+    if (contextMenu.__domBreakpointItemsAdded)
+        return;
+
+    if (!contextMenu.__localOverrideItemsAdded && WI.NetworkManager.supportsLocalResourceOverrides()) {
+        contextMenu.__localOverrideItemsAdded = true;
+
         if (WI.networkManager.canBeOverridden(sourceCode)) {
             contextMenu.appendSeparator();

trunk/Source/WebInspectorUI/UserInterface/Views/LocalResourceOverrideTreeElement.js

@@ -100 +100 @@
     populateContextMenu(contextMenu, event)
     {
+        contextMenu.__localOverrideItemsAdded = true;
+
         contextMenu.appendItem(WI.UIString("Edit Local Override\u2026"), (event) => {
             let popover = new WI.LocalResourceOverridePopover(this);