Attachment 348934 Details for Bug 189308 – Patch

[patch] Patch

189308.diff (text/plain), 2.93 KB, created by Devin Rousso on 2018-09-05 10:07:35 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2018-09-05 10:07:35 PDT

Size: 2.93 KB

patch

obsolete

>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index e4d59f251aa..fa6f62948ea 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-09-05  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/Views/ContextMenuUtilities.js:
>+        (WI.appendContextMenuItemsForDOMNode):
>+        * UserInterface/Views/DOMTreeElement.js:
>+        (WI.DOMTreeElement.prototype.get statusImageElement): Added.
>+        * UserInterface/Views/DOMTreeOutline.js:
>+        (WI.DOMTreeOutline.prototype.populateContextMenu):
>+
> 2018-08-29  David Kilzer  <ddkilzer@apple.com>
> 
>         Remove empty directories from from svn.webkit.org repository
>diff --git a/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js b/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js
>index cb9fc31acdf..92f2493d462 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js
>@@ -188,7 +188,7 @@ WI.appendContextMenuItemsForDOMNode = function(contextMenu, domNode, options = {
>         contextMenu.appendSeparator();
>     }
> 
>-    if (WI.domDebuggerManager.supported && isElement && !domNode.isPseudoElement() && domNode.ownerDocument) {
>+    if (!options.excludeBreakpointItems && WI.domDebuggerManager.supported && isElement && !domNode.isPseudoElement() && domNode.ownerDocument) {
>         contextMenu.appendSeparator();
> 
>         const allowEditing = false;
>diff --git a/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js b/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js
>index 5b7afda18b1..203429e1608 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js
>@@ -101,6 +101,8 @@ WI.DOMTreeElement = class DOMTreeElement extends WI.TreeElement
>         }
>     }
> 
>+    get statusImageElement() { return this._statusImageElement; }
>+
>     revealAndHighlight()
>     {
>         if (this._animatingHighlight)
>diff --git a/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js b/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js
>index b627e0cd94d..3670a80719a 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js
>@@ -259,6 +259,7 @@ WI.DOMTreeOutline = class DOMTreeOutline extends WI.TreeOutline
> 
>         let options = {
>             excludeRevealElement: this._excludeRevealElementContextMenu,
>+            excludeBreakpointItems: treeElement.statusImageElement.contains(event.target),
>             copySubMenu: subMenus.copy,
>         };
>         WI.appendContextMenuItemsForDOMNode(contextMenu, treeElement.representedObject, options);

Actions: View | Formatted Diff | Diff

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