Changeset 237327 in webkit

Timestamp:

Oct 22, 2018 12:24:04 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Open Quickly dialog doesn't show named scripts that appear in the debugger sidebar
​https://bugs.webkit.org/show_bug.cgi?id=190649

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2018-10-22
Reviewed by Devin Rousso.

• UserInterface/Views/OpenResourceDialog.js:

(WI.OpenResourceDialog.prototype.didPresentDialog):
(WI.OpenResourceDialog.prototype._addResourcesForTarget):
(WI.OpenResourceDialog.prototype._addScriptsForTarget):
Include non-resource named scripts from the main target in
the open quickly dialog.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/OpenResourceDialog.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2018-10-22  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Open Quickly dialog doesn't show named scripts that appear in the debugger sidebar
+        https://bugs.webkit.org/show_bug.cgi?id=190649
+
+        Reviewed by Devin Rousso.
+
+        * UserInterface/Views/OpenResourceDialog.js:
+        (WI.OpenResourceDialog.prototype.didPresentDialog):
+        (WI.OpenResourceDialog.prototype._addResourcesForTarget):
+        (WI.OpenResourceDialog.prototype._addScriptsForTarget):
+        Include non-resource named scripts from the main target in
+        the open quickly dialog.
+
 2018-10-19  Joseph Pecoraro  <pecoraro@apple.com>
 

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

@@ -148 +148 @@
             this._addResourcesForFrame(WI.networkManager.mainFrame);
 
+        this._addScriptsForTarget(WI.mainTarget);
+
         for (let target of WI.targets) {
             if (target !== WI.mainTarget)
@@ -313 +315 @@
             this._addResource(resource, suppressFilterUpdate);
 
+        this._addScriptsForTarget(target);
+    }
+
+    _addScriptsForTarget(target)
+    {
+        const suppressFilterUpdate = true;
+
         let targetData = WI.debuggerManager.dataForTarget(target);
         for (let script of targetData.scripts) {
             if (script.resource)
                 continue;
-            if (isWebKitInternalScript(script.sourceURL) || isWebInspectorConsoleEvaluationScript(script.sourceURL))
+            if (script.dynamicallyAddedScriptElement)
+                continue;
+            if (!script.sourceURL || isWebKitInternalScript(script.sourceURL) || isWebInspectorConsoleEvaluationScript(script.sourceURL))
                 continue;
             this._addResource(script, suppressFilterUpdate);