Attachment 349741 Details for Bug 189308 – Patch

[patch] Patch

bug-189308-20180913235616.patch (text/plain), 2.07 KB, created by Devin Rousso on 2018-09-13 23:56:17 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2018-09-13 23:56:17 PDT

Size: 2.07 KB

patch

obsolete

>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index 122f754db61c84e64e17fe16840095d8608f42a7..14db3fc2d4bd5c8c0c09303c0c39c05e9b866999 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-09-13  Devin Rousso  <drousso@apple.com>
>+
>+        Web Inspector: REGRESSION: breakpoint context menu appears twice in DOM tree
>+        https://bugs.webkit.org/show_bug.cgi?id=189308
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UserInterface/Controllers/DOMBreakpointTreeController.js:
>+        (WI.DOMBreakpointTreeController.appendBreakpointContextMenuItems):
>+        Set a symbol on the `contextMenu` to ensure that the same items are not added twice.
>+
> 2018-09-06  Andy Estes  <aestes@apple.com>
> 
>         [Apple Pay] Rename the -apple-pay-button-type value "checkout" to "check-out"
>diff --git a/Source/WebInspectorUI/UserInterface/Controllers/DOMBreakpointTreeController.js b/Source/WebInspectorUI/UserInterface/Controllers/DOMBreakpointTreeController.js
>index 9e8aba7a54c49ae4a5c1eba8a44f3344570d7d7f..04f94933748a3dc36ef442f6bc8f3d78151cf2b8 100644
>--- a/Source/WebInspectorUI/UserInterface/Controllers/DOMBreakpointTreeController.js
>+++ b/Source/WebInspectorUI/UserInterface/Controllers/DOMBreakpointTreeController.js
>@@ -46,6 +46,11 @@ WI.DOMBreakpointTreeController = class DOMBreakpointsTreeController extends WI.O
>     {
>         console.assert(WI.domDebuggerManager.supported);
> 
>+        if (contextMenu[WI.DOMBreakpointTreeController._contextMenuItemsAddedSymbol])
>+            return;
>+
>+        contextMenu[WI.DOMBreakpointTreeController._contextMenuItemsAddedSymbol] = true;
>+
>         let subMenu = contextMenu.appendSubMenuItem(WI.UIString("Break onâ¦"));
> 
>         let breakpoints = WI.domDebuggerManager.domBreakpointsForNode(domNode);
>@@ -169,3 +174,5 @@ WI.DOMBreakpointTreeController = class DOMBreakpointsTreeController extends WI.O
>         this._domNodeTreeElements.clear();
>     }
> };
>+
>+WI.DOMBreakpointTreeController._contextMenuItemsAddedSymbol = Symbol("context-menu-dom-breakpoint-items-added");

Flags:

joepeck: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 189308: 348933 | 348934 | 349741 | 349859