Title: [255003] branches/safari-609-branch/Source/WebInspectorUI
- Revision
- 255003
- Author
- [email protected]
- Date
- 2020-01-23 13:43:12 -0800 (Thu, 23 Jan 2020)
Log Message
Cherry-pick r254485. rdar://problem/58606245
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`.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254485 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-609-branch/Source/WebInspectorUI/ChangeLog (255002 => 255003)
--- branches/safari-609-branch/Source/WebInspectorUI/ChangeLog 2020-01-23 21:43:10 UTC (rev 255002)
+++ branches/safari-609-branch/Source/WebInspectorUI/ChangeLog 2020-01-23 21:43:12 UTC (rev 255003)
@@ -1,3 +1,38 @@
+2020-01-23 Russell Epstein <[email protected]>
+
+ Cherry-pick r254485. rdar://problem/58606245
+
+ 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`.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254485 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-01-13 Devin Rousso <[email protected]>
+
+ 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-15 Alan Coon <[email protected]>
Cherry-pick r254058. rdar://problem/58606175
Modified: branches/safari-609-branch/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js (255002 => 255003)
--- branches/safari-609-branch/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js 2020-01-23 21:43:10 UTC (rev 255002)
+++ branches/safari-609-branch/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js 2020-01-23 21:43:12 UTC (rev 255003)
@@ -70,7 +70,12 @@
if (!(sourceCode instanceof WI.SourceCode))
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();
contextMenu.appendItem(WI.UIString("Create Local Override"), async () => {
Modified: branches/safari-609-branch/Source/WebInspectorUI/UserInterface/Views/LocalResourceOverrideTreeElement.js (255002 => 255003)
--- branches/safari-609-branch/Source/WebInspectorUI/UserInterface/Views/LocalResourceOverrideTreeElement.js 2020-01-23 21:43:10 UTC (rev 255002)
+++ branches/safari-609-branch/Source/WebInspectorUI/UserInterface/Views/LocalResourceOverrideTreeElement.js 2020-01-23 21:43:12 UTC (rev 255003)
@@ -99,6 +99,8 @@
populateContextMenu(contextMenu, event)
{
+ contextMenu.__localOverrideItemsAdded = true;
+
contextMenu.appendItem(WI.UIString("Edit Local Override\u2026"), (event) => {
let popover = new WI.LocalResourceOverridePopover(this);
popover.show(this._localResourceOverride, this.status, [WI.RectEdge.MAX_X, WI.RectEdge.MIN_X]);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
