Changeset 92688 in webkit

Timestamp:

Aug 9, 2011 9:09:00 AM (13 years ago)

Author:

pfeldman@chromium.org

Message:

Web Inspector: files from different domains are mixed in the file selector in Scripts panel
​https://bugs.webkit.org/show_bug.cgi?id=65601

Reviewed by Yury Semikhatsky.

Source/WebCore:

• inspector/front-end/ScriptsPanel.js:

(WebInspector.ScriptsPanel.prototype._addOptionToFilesSelect):
(WebInspector.ScriptsPanel.prototype._folderAndDisplayNameForScriptURL):
(WebInspector.ScriptsPanel.prototype.reset):

• inspector/front-end/inspector.css:

(select.status-bar-item):

LayoutTests:

• inspector/debugger/scripts-panel-expected.txt:
• platform/chromium/inspector/debugger/scripts-sorting-expected.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/debugger/scripts-panel-expected.txt (modified) (1 diff)
• LayoutTests/platform/chromium/inspector/debugger/scripts-sorting-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/ScriptsPanel.js (modified) (5 diffs)
• Source/WebCore/inspector/front-end/inspector.css (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-08-09  Pavel Feldman  <pfeldman@google.com>
+
+        Web Inspector: files from different domains are mixed in the file selector in Scripts panel
+        https://bugs.webkit.org/show_bug.cgi?id=65601
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/debugger/scripts-panel-expected.txt:
+        * platform/chromium/inspector/debugger/scripts-sorting-expected.txt:
+
 2011-08-09  Pavel Feldman  <pfeldman@google.com>
 

trunk/LayoutTests/inspector/debugger/scripts-panel-expected.txt

@@ -11 +11 @@
 
 Running: testFilesSelect
-text:     ?a=b, tooltip: ?a=b
-text:     ?a=b, tooltip: http://example.com/?a=b
-text:     …oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_url, tooltip: very_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_url
+text:         ?a=b, tooltip: ?a=b
+text:         …oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_url, tooltip: very_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_url
+text: example.com, tooltip: 
+text:         ?a=b, tooltip: http://example.com/?a=b
 text: LayoutTests/inspector/debugger/foo/bar, tooltip: 
-text:     script.js, tooltip: <root>/foo/bar/script.js
-text:     script.js?a=1, tooltip: <root>/foo/bar/script.js?a=1
-text:     script.js?a=2, tooltip: <root>/foo/bar/script.js?a=2
+text:         script.js, tooltip: <root>/foo/bar/script.js
+text:         script.js?a=1, tooltip: <root>/foo/bar/script.js?a=1
+text:         script.js?a=2, tooltip: <root>/foo/bar/script.js?a=2
 text: LayoutTests/inspector/debugger/foo/baz, tooltip: 
-text:     script.js, tooltip: <root>/foo/baz/script.js
+text:         script.js, tooltip: <root>/foo/baz/script.js
 text: Content scripts, tooltip: 
-text:     contentScript.js?a=1, tooltip: <root>/foo/bar/contentScript.js?a=1
-text:     contentScript.js?a=2, tooltip: <root>/foo/bar/contentScript.js?a=2
-text:     contentScript2.js?a=1, tooltip: <root>/foo/bar/contentScript2.js?a=1
+text:         contentScript.js?a=1, tooltip: <root>/foo/bar/contentScript.js?a=1
+text:         contentScript.js?a=2, tooltip: <root>/foo/bar/contentScript.js?a=2
+text:         contentScript2.js?a=1, tooltip: <root>/foo/bar/contentScript2.js?a=1
 Debugger was disabled.
 

trunk/LayoutTests/platform/chromium/inspector/debugger/scripts-sorting-expected.txt

@@ -2 +2 @@
 
 Debugger was enabled.
-    *Non*URL*path
-    block.js?block=foo
-    ga.js
-    lenta.ban?pg=4883&ifr=1
-    lenta.ban?pg=5309&ifr=1
-    top100.jcn?80674
-/_js/production
-    motor.js?1308927432
-/i
-    xgemius.js
-/i/js
-    jquery-1.5.1.min.js
-    jquery.cookie.js
+        *Non*URL*path
+foo.com
+        block.js?block=foo
+        ga.js
+        lenta.ban?pg=4883&ifr=1
+        lenta.ban?pg=5309&ifr=1
+        top100.jcn?80674
+    /_js/production
+        motor.js?1308927432
+    /i
+        xgemius.js
+    /i/js
+        jquery-1.5.1.min.js
+        jquery.cookie.js
 Debugger was disabled.
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-09  Pavel Feldman  <pfeldman@google.com>
+
+        Web Inspector: files from different domains are mixed in the file selector in Scripts panel
+        https://bugs.webkit.org/show_bug.cgi?id=65601
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/front-end/ScriptsPanel.js:
+        (WebInspector.ScriptsPanel.prototype._addOptionToFilesSelect):
+        (WebInspector.ScriptsPanel.prototype._folderAndDisplayNameForScriptURL):
+        (WebInspector.ScriptsPanel.prototype.reset):
+        * inspector/front-end/inspector.css:
+        (select.status-bar-item):
+
 2011-08-09  Pavel Feldman  <pfeldman@google.com>
 

trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js

@@ -256 +256 @@
     {
         var select = this._filesSelectElement;
+        if (!select.domainOptions)
+            select.domainOptions = {};
         if (!select.folderOptions)
             select.folderOptions = {};
@@ -263 +265 @@
 
         var names = this._folderAndDisplayNameForScriptURL(sourceFile.url);
-        option.text = names.displayName ? "\u00a0\u00a0\u00a0\u00a0" + names.displayName : WebInspector.UIString("(program)");
+        const indent = "\u00a0\u00a0\u00a0\u00a0";
+        option.text = names.displayName ? indent + indent + names.displayName : WebInspector.UIString("(program)");
         option.scriptNameForTest = names.displayName;
-        var folderNameForSorting = (sourceFile.isContentScript ? "2" : "0") + names.folderName;
+
+        var folderNameForSorting;
+        if (sourceFile.isContentScript)
+            folderNameForSorting = "2:" + names.folderName;
+        else
+            folderNameForSorting = "0:" + (names.domain ? names.domain + "\t\t" : "") + names.folderName;
+
         option.nameForSorting = folderNameForSorting + "\t/\t" + names.displayName; // Use '\t' to make files stick to their folder.
         option.title = sourceFile.url;
@@ -292 +301 @@
         }
 
+        if (!sourceFile.isContentScript && names.domain && !select.domainOptions[names.domain]) {
+            var domainOption = document.createElement("option");
+            domainOption.text = names.domain;
+            domainOption.nameForSorting = "0:" + names.domain;
+            domainOption.disabled = true;
+            select.domainOptions[names.domain] = domainOption;
+            insertOrdered(domainOption);
+        }
+
         if (names.folderName && !select.folderOptions[names.folderName]) {
             var folderOption = document.createElement("option");
-            folderOption.text = names.folderName;
+            folderOption.text = indent + names.folderName;
             folderOption.nameForSorting = folderNameForSorting;
             folderOption.disabled = true;
@@ -326 +344 @@
             folderName = "\u2026" + folderName.substring(folderName.length - 80);
 
-        return { folderName: folderName, displayName: displayName};
+        return { domain: (parsedURL ? parsedURL.host : ""), folderName: folderName, displayName: displayName };
     },
 
@@ -514 +532 @@
         this._filesSelectElement.removeChildren();
         this._filesSelectElement.removeChildren();
+        this._filesSelectElement.domainOptions = {};
         this._filesSelectElement.folderOptions = {};
         delete this._filesSelectElement.initialSelectionProcessed;

trunk/Source/WebCore/inspector/front-end/inspector.css

@@ -492 +492 @@
     min-width: 48px;
     border-width: 0 17px 0 2px;
-    padding: 0 2px 0 6px;
+    padding: 0 2px 0 0;
     font-weight: bold;
     color: rgb(48, 48, 48);