Attachment 343547 Details for Bug 187020 – Patch

[patch] Patch

bug-187020-20180625151126.patch (text/plain), 2.18 KB, created by Matt Baker on 2018-06-25 15:11:27 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Baker

Created: 2018-06-25 15:11:27 PDT

Size: 2.18 KB

patch

obsolete

>Subversion Revision: 233164
>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index 6d68f5fa98806232c3129718f7bc35ef5053acc5..d02ddd2913dff12aca4aa0bb0cbf03b3ac91ef55 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,15 @@
>+2018-06-25  Matt Baker  <mattbaker@apple.com>
>+
>+        Web Inspector: REGRESSION (r213000): copy from Search results content view broken
>+        https://bugs.webkit.org/show_bug.cgi?id=187020
>+        <rdar://problem/40928766>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UserInterface/Views/SearchTabContentView.js:
>+        (WI.SearchTabContentView.prototype.handleCopyEvent):
>+        Prefer content view selection to the selected tree element, if it exists.
>+
> 2018-06-25  Nikita Vasilyev  <nvasilyev@apple.com>
> 
>         Web Inspector: Dark Mode: color outline is too dark
>diff --git a/Source/WebInspectorUI/UserInterface/Views/SearchTabContentView.js b/Source/WebInspectorUI/UserInterface/Views/SearchTabContentView.js
>index db771acc82724126a942649d1e039c493be14298..9f979b4411cfb6c336b98a79d508d40c4502bd68 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/SearchTabContentView.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/SearchTabContentView.js
>@@ -99,6 +99,19 @@ WI.SearchTabContentView = class SearchTabContentView extends WI.ContentBrowserTa
> 
>     handleCopyEvent(event)
>     {
>+        let currentContentView = this.contentBrowser.currentContentView;
>+        if (currentContentView) {
>+            if (currentContentView instanceof WI.ClusterContentView)
>+                currentContentView = currentContentView.contentViewContainer.currentContentView;
>+
>+            if (currentContentView.textEditor) {
>+                let range = currentContentView.textEditor.selectedTextRange;
>+                // If the TextEditor contains a selection, don't override the default copy behavior.
>+                if (range.startLine !== range.endLine || range.startColumn !== range.endColumn)
>+                    return;
>+            }
>+        }
>+
>         let selectedTreeElement = this.navigationSidebarPanel.contentTreeOutline.selectedTreeElement;
>         if (!selectedTreeElement)
>             return;

Actions: View | Formatted Diff | Diff

Attachments on bug 187020: 343547 | 343847