Changeset 143568 in webkit

Timestamp:

Feb 20, 2013 11:53:49 PM (11 years ago)

Author:

vsevik@chromium.org

Message:

Web Inspector: TabbedEditorContainer and OpenResourceDialog should show uiSourceCode path and name instead of parsedURL
​https://bugs.webkit.org/show_bug.cgi?id=110334

Reviewed by Alexander Pavlov.

Source/WebCore:

Introduced uiSourceCode.name() that returns a name based on uiSourceCode path.
OpenResourceDialog now shows uiSourceCode workspace path as a subtitle.
TabbedEditorContainer now shows uiSourceCode name in the tab header.

• inspector/front-end/FilteredItemSelectionDialog.js:

(WebInspector.OpenResourceDialog.filterOutEmptyURLs):
(WebInspector.OpenResourceDialog):
(WebInspector.OpenResourceDialog.prototype.itemTitleAt):
(WebInspector.OpenResourceDialog.prototype.itemSubtitleAt):
(WebInspector.OpenResourceDialog.prototype.itemKeyAt):

• inspector/front-end/NavigatorView.js:

(WebInspector.NavigatorView.prototype._updateScriptTitle):

• inspector/front-end/TabbedEditorContainer.js:

(WebInspector.TabbedEditorContainer.prototype._titleForFile):

• inspector/front-end/UISourceCode.js:

(WebInspector.UISourceCode.prototype.name):

LayoutTests:

• inspector/debugger/scripts-file-selector-expected.txt:
• inspector/debugger/ui-source-code-display-name-expected.txt:
• inspector/debugger/ui-source-code-display-name.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/debugger/ui-source-code-display-name-expected.txt (modified) (1 diff)
• LayoutTests/inspector/debugger/ui-source-code-display-name.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/FilteredItemSelectionDialog.js (modified) (4 diffs)
• Source/WebCore/inspector/front-end/TabbedEditorContainer.js (modified) (1 diff)
• Source/WebCore/inspector/front-end/UISourceCode.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-20  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: TabbedEditorContainer and OpenResourceDialog should show uiSourceCode path and name instead of parsedURL
+        https://bugs.webkit.org/show_bug.cgi?id=110334
+
+        Reviewed by Alexander Pavlov.
+
+        * inspector/debugger/scripts-file-selector-expected.txt:
+        * inspector/debugger/ui-source-code-display-name-expected.txt:
+        * inspector/debugger/ui-source-code-display-name.html:
+
 2013-02-20  Mike West  <mkwst@chromium.org>
 

trunk/LayoutTests/inspector/debugger/ui-source-code-display-name-expected.txt

@@ -3 +3 @@
 UISourceCode display name for url "http://localhost:8080/folder/filename?parameter=value&nnn=1" is "filename?parameter=value&nnn=1".
 UISourceCode display name for url "http://localhost:8080/folder/very-long-filename-123456?nn=1" is "very-long-filename-123456?nn=1".
-UISourceCode display name for url "http://localhost:8080/folder/too-long-filename-1234567890?nn=1" is "too-long-fil…e-1234567890?nn=1".
-UISourceCode display name for url "http://localhost:8080/folder/long-filename?parameter=value&nnn=1" is "long-filename?parameter=value…".
-UISourceCode display name for url "http://localhost:8080/folder/too-long-filename-1234567890?parameter=value&nnn=1" is "too-long-fil…e-1234567890?par…".
+UISourceCode display name for url "http://localhost:8080/folder/too-long-filename-1234567890?nn=1" is "too-long-filena…234567890?nn=1".
+UISourceCode display name for url "http://localhost:8080/folder/long-filename?parameter=value&nnn=1" is "long-filename?p…er=value&nnn=1".
+UISourceCode display name for url "http://localhost:8080/folder/too-long-filename-1234567890?parameter=value&nnn=1" is "too-long-filena…er=value&nnn=1".
 

trunk/LayoutTests/inspector/debugger/ui-source-code-display-name.html

@@ -6 +6 @@
 {
     WebInspector.showPanel("scripts");
+
+    function createContentProvider(url)
+    {
+        var contentProvider = new WebInspector.StaticContentProvider(WebInspector.resourceTypes.Script, "", "text/javascript");
+        contentProvider.requestContent = function(callback)
+        {
+            InspectorTest.addResult("Source requested for " + url);
+            callback("");
+        };
+        return contentProvider;
+    }
+
+    var workspace = new WebInspector.Workspace();
+    workspace.networkWorkspaceProvider = new WebInspector.SimpleWorkspaceProvider(workspace, WebInspector.projectTypes.Network);
+
+    function addNetworkFile(url)
+    {
+        return workspace.networkWorkspaceProvider.addFileForURL(url, createContentProvider(url), false);
+    }
+
     function dumpUISourceCodeDisplayName(url)
     {
-        var uiSourceCode = new WebInspector.UISourceCode(null, url, url, url, null);
+        var uiSourceCode = addNetworkFile(url);
         InspectorTest.addResult("UISourceCode display name for url \"" + url + "\" is \"" + WebInspector.TabbedEditorContainer.prototype._titleForFile(uiSourceCode) + "\".");
     }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-20  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: TabbedEditorContainer and OpenResourceDialog should show uiSourceCode path and name instead of parsedURL
+        https://bugs.webkit.org/show_bug.cgi?id=110334
+
+        Reviewed by Alexander Pavlov.
+
+        Introduced uiSourceCode.name() that returns a name based on uiSourceCode path.
+        OpenResourceDialog now shows uiSourceCode workspace path as a subtitle.
+        TabbedEditorContainer now shows uiSourceCode name in the tab header.
+
+        * inspector/front-end/FilteredItemSelectionDialog.js:
+        (WebInspector.OpenResourceDialog.filterOutEmptyURLs):
+        (WebInspector.OpenResourceDialog):
+        (WebInspector.OpenResourceDialog.prototype.itemTitleAt):
+        (WebInspector.OpenResourceDialog.prototype.itemSubtitleAt):
+        (WebInspector.OpenResourceDialog.prototype.itemKeyAt):
+        * inspector/front-end/NavigatorView.js:
+        (WebInspector.NavigatorView.prototype._updateScriptTitle):
+        * inspector/front-end/TabbedEditorContainer.js:
+        (WebInspector.TabbedEditorContainer.prototype._titleForFile):
+        * inspector/front-end/UISourceCode.js:
+        (WebInspector.UISourceCode.prototype.name):
+
 2013-02-20  Pavel Feldman  <pfeldman@chromium.org>
 

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

@@ -586 +586 @@
     function filterOutEmptyURLs(uiSourceCode)
     {
-        return !!uiSourceCode.parsedURL.lastPathComponent;
+        return !!uiSourceCode.name();
     }
     this._uiSourceCodes = this._uiSourceCodes.filter(filterOutEmptyURLs);
@@ -598 +598 @@
     itemTitleAt: function(itemIndex)
     {
-        return this._uiSourceCodes[itemIndex].parsedURL.lastPathComponent;
+        return this._uiSourceCodes[itemIndex].name().trimEnd(100);
     },
 
@@ -616 +616 @@
     itemSubtitleAt: function(itemIndex)
     {
-        return this._uiSourceCodes[itemIndex].parsedURL.folderPathComponents;
+        var uiSourceCode = this._uiSourceCodes[itemIndex]
+        var projectName = uiSourceCode.project().displayName();
+        var path = uiSourceCode.path().slice();
+        path.pop();
+        path.unshift(projectName);
+        return path.join("/");
     },
 
@@ -625 +630 @@
     itemKeyAt: function(itemIndex)
     {
-        return this._uiSourceCodes[itemIndex].parsedURL.lastPathComponent;
+        return this._uiSourceCodes[itemIndex].name();
     },
 

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

@@ -171 +171 @@
         const minDisplayQueryParamLength = 5;
 
-        var title;
-        var parsedURL = uiSourceCode.parsedURL;
-        if (!parsedURL.isValid)
-            title = parsedURL.url ? parsedURL.url.trimMiddle(maxDisplayNameLength) : WebInspector.UIString("(program)");
-        else {
-            var maxDisplayQueryParamLength = Math.max(minDisplayQueryParamLength, maxDisplayNameLength - parsedURL.lastPathComponent.length);
-            var displayQueryParams = parsedURL.queryParams ? "?" + parsedURL.queryParams.trimEnd(maxDisplayQueryParamLength - 1) : "";
-            var displayLastPathComponent = parsedURL.lastPathComponent.trimMiddle(maxDisplayNameLength - displayQueryParams.length);
-            var displayName = displayLastPathComponent + displayQueryParams;
-            title = displayName || WebInspector.UIString("(program)");
-        }
-        
+        var title = uiSourceCode.name();
+        title = title ? title.trimMiddle(maxDisplayNameLength) : WebInspector.UIString("(program)");
         if (uiSourceCode.isDirty())
             title += "*";

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

@@ -97 +97 @@
     {
         return this._path;
+    },
+
+    /**
+     * @return {string}
+     */
+    name: function()
+    {
+        return this._path[this._path.length - 1];
     },