Title: [233334] trunk/Source/WebInspectorUI
Revision
233334
Author
[email protected]
Date
2018-06-28 15:38:41 -0700 (Thu, 28 Jun 2018)

Log Message

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 Timothy Hatcher.

Since WI._copy listens for a copy event from the document, it is called
after CodeMirror handles the event and sets clipboard data. If WI._copy
finds a custom copy handler to call, that handler can determine whether
to overwrite the current clipboard data, or leave it alone.

SearchTabContentView's handleCopyEvent method should return early if the
content tree outline doesn't have the focus. This prevents the selection
in the TextEditor from being overwritten, without any special knowledge of
the content browser's current view.

* UserInterface/Views/SearchTabContentView.js:
(WI.SearchTabContentView.prototype.handleCopyEvent):

Modified Paths

Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (233333 => 233334)


--- trunk/Source/WebInspectorUI/ChangeLog	2018-06-28 22:14:39 UTC (rev 233333)
+++ trunk/Source/WebInspectorUI/ChangeLog	2018-06-28 22:38:41 UTC (rev 233334)
@@ -1,3 +1,24 @@
+2018-06-28  Matt Baker  <[email protected]>
+
+        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 Timothy Hatcher.
+
+        Since WI._copy listens for a copy event from the document, it is called
+        after CodeMirror handles the event and sets clipboard data. If WI._copy
+        finds a custom copy handler to call, that handler can determine whether
+        to overwrite the current clipboard data, or leave it alone.
+
+        SearchTabContentView's handleCopyEvent method should return early if the
+        content tree outline doesn't have the focus. This prevents the selection
+        in the TextEditor from being overwritten, without any special knowledge of
+        the content browser's current view.
+
+        * UserInterface/Views/SearchTabContentView.js:
+        (WI.SearchTabContentView.prototype.handleCopyEvent):
+
 2018-06-25  Nikita Vasilyev  <[email protected]>
 
         Web Inspector: Dark Mode: Box Model section should have dark background

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SearchTabContentView.js (233333 => 233334)


--- trunk/Source/WebInspectorUI/UserInterface/Views/SearchTabContentView.js	2018-06-28 22:14:39 UTC (rev 233333)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SearchTabContentView.js	2018-06-28 22:38:41 UTC (rev 233334)
@@ -99,7 +99,11 @@
 
     handleCopyEvent(event)
     {
-        let selectedTreeElement = this.navigationSidebarPanel.contentTreeOutline.selectedTreeElement;
+        let contentTreeOutline = this.navigationSidebarPanel.contentTreeOutline;
+        if (contentTreeOutline.element !== document.activeElement)
+            return;
+
+        let selectedTreeElement = contentTreeOutline.selectedTreeElement;
         if (!selectedTreeElement)
             return;
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to