Changeset 213000 in webkit

Timestamp:

Feb 25, 2017 12:29:59 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: copying a search result out of Search Tab navigation sidebar does nothing
​https://bugs.webkit.org/show_bug.cgi?id=167074

Patch by Devin Rousso <Devin Rousso> on 2017-02-25
Reviewed by Brian Burg.

• UserInterface/Base/Main.js:

(WebInspector._copy):

• UserInterface/Views/SearchTabContentView.js:

(WebInspector.SearchTabContentView.prototype.handleCopyEvent):
Provide the container TabContentView with the opportunity to intercept the copy event.

• UserInterface/Models/SourceCodeTextRange.js:

(WebInspector.SourceCodeTextRange.prototype.get synthesizedTextValue):

• UserInterface/Views/SearchResultTreeElement.js:

(WebInspector.SearchResultTreeElement.prototype.get synthesizedTextValue):
Generate a string with the format ${url}:${lineNumber}:${resultLine}.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Base/Main.js (modified) (1 diff)
• UserInterface/Models/SourceCodeTextRange.js (modified) (1 diff)
• UserInterface/Views/SearchResultTreeElement.js (modified) (1 diff)
• UserInterface/Views/SearchTabContentView.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2017-02-25  Devin Rousso  <dcrousso+webkit@gmail.com>
+
+        Web Inspector: copying a search result out of Search Tab navigation sidebar does nothing
+        https://bugs.webkit.org/show_bug.cgi?id=167074
+
+        Reviewed by Brian Burg.
+
+        * UserInterface/Base/Main.js:
+        (WebInspector._copy):
+        * UserInterface/Views/SearchTabContentView.js:
+        (WebInspector.SearchTabContentView.prototype.handleCopyEvent):
+        Provide the container TabContentView with the opportunity to intercept the copy event.
+
+        * UserInterface/Models/SourceCodeTextRange.js:
+        (WebInspector.SourceCodeTextRange.prototype.get synthesizedTextValue):
+        * UserInterface/Views/SearchResultTreeElement.js:
+        (WebInspector.SearchResultTreeElement.prototype.get synthesizedTextValue):
+        Generate a string with the format `${url}:${lineNumber}:${resultLine}`.
+
 2017-02-25  Devin Rousso  <dcrousso+webkit@gmail.com>
 

trunk/Source/WebInspectorUI/UserInterface/Base/Main.js

@@ -2109 +2109 @@
         }
 
+        let tabContentView = this.tabBrowser.selectedTabContentView;
+        if (tabContentView && typeof tabContentView.handleCopyEvent === "function") {
+            tabContentView.handleCopyEvent(event);
+            return;
+        }
+
         return;
     }

trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeTextRange.js

@@ -106 +106 @@
     }
 
+    get synthesizedTextValue()
+    {
+        // Must add 1 to the lineNumber since it starts counting at 0.
+        return this._sourceCode.url + ":" + (this._startLocation.lineNumber + 1);
+    }
+
     // Private
 

trunk/Source/WebInspectorUI/UserInterface/Views/SearchResultTreeElement.js

@@ -81 +81 @@
         return {text: [this.representedObject.title]};
     }
+
+    get synthesizedTextValue()
+    {
+        return this.representedObject.sourceCodeTextRange.synthesizedTextValue + ":" + this.representedObject.title;
+    }
 };
 

trunk/Source/WebInspectorUI/UserInterface/Views/SearchTabContentView.js

@@ -86 +86 @@
     }
 
+    handleCopyEvent(event)
+    {
+        let selectedTreeElement = this.navigationSidebarPanel.contentTreeOutline.selectedTreeElement;
+        if (!selectedTreeElement)
+            return;
+
+        event.clipboardData.setData("text/plain", selectedTreeElement.synthesizedTextValue);
+        event.stopPropagation();
+        event.preventDefault();
+    }
+
     // Protected