Changeset 94067 in webkit

Timestamp:

Aug 30, 2011, 3:57:11 AM (15 years ago)

Author:

yurys@chromium.org

Message:

Web Inspector: wrong script display name when there is a slash in its URL query parameters
​https://bugs.webkit.org/show_bug.cgi?id=67120

Source/WebCore:

Fixed folder name computation in ScriptsPanel. Now search query is ignored
when searching for the script folder name.

Reviewed by Pavel Feldman.

• inspector/front-end/ScriptsPanel.js:

(WebInspector.ScriptsPanel.prototype._folderAndDisplayNameForScriptURL):

LayoutTests:

Reviewed by Pavel Feldman.

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

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-08-29  Yury Semikhatsky  <yurys@chromium.org>
+
+        Web Inspector: wrong script display name when there is a slash in its URL query parameters
+        https://bugs.webkit.org/show_bug.cgi?id=67120
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/debugger/scripts-sorting.html:
+        * platform/chromium/inspector/debugger/scripts-sorting-expected.txt:
+
 2011-08-30  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/LayoutTests/inspector/debugger/scripts-sorting.html

@@ -14 +14 @@
     "i/xgemius.js",
     "i/js/jquery-1.5.1.min.js",
-    "i/js/jquery.cookie.js" ];
+    "i/js/jquery.cookie.js",
+    "foo/path/bar.js?file=bar/zzz.js",
+    "foo/path/foo.js?file=bar/aaa.js" ];
 
 for (var i = 0; i < scripts.length; ++i)

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

@@ -13 +13 @@
 /_js/production
     motor.js?1308927432
+/foo/path
+    bar.js?file=bar/zzz.js
+    foo.js?file=bar/aaa.js
 /i
     xgemius.js
@@ -21 +24 @@
 WebInspector.settings.showScriptFolders = false
 *Non*URL*path
+bar.js?file=bar/zzz.js
 block.js?block=foo
+foo.js?file=bar/aaa.js
 ga.js
 jquery-1.5.1.min.js
@@ -41 +46 @@
 /_js/production
     motor.js?1308927432
+/foo/path
+    bar.js?file=bar/zzz.js
+    foo.js?file=bar/aaa.js
 /i
     xgemius.js

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-29  Yury Semikhatsky  <yurys@chromium.org>
+
+        Web Inspector: wrong script display name when there is a slash in its URL query parameters
+        https://bugs.webkit.org/show_bug.cgi?id=67120
+
+        Fixed folder name computation in ScriptsPanel. Now search query is ignored
+        when searching for the script folder name.
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/front-end/ScriptsPanel.js:
+        (WebInspector.ScriptsPanel.prototype._folderAndDisplayNameForScriptURL):
+
 2011-08-29  Yury Semikhatsky  <yurys@chromium.org>
 

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

@@ -352 +352 @@
         var displayName = url;
 
-        var fromIndex = displayName.lastIndexOf("/", displayName.length - 2);
+        var pathLength = displayName.indexOf("?");
+        if (pathLength === -1)
+            pathLength = displayName.length;
+
+        var fromIndex = displayName.lastIndexOf("/", pathLength - 2);
         if (fromIndex !== -1) {
             folderName = displayName.substring(0, fromIndex);