Changeset 84623 in webkit

Timestamp:

Apr 22, 2011 6:18:13 AM (13 years ago)

Author:

pfeldman@chromium.org

Message:

2011-04-21 Pavel Feldman <​pfeldman@google.com>

Reviewed by Yury Semikhatsky.

Web Inspector: group content scripts in the scripts panel drop down.
​https://bugs.webkit.org/show_bug.cgi?id=59108

• English.lproj/localizedStrings.js:
• inspector/front-end/ScriptsPanel.js: (WebInspector.ScriptsPanel.prototype._addOptionToFilesSelect.optionCompare): (WebInspector.ScriptsPanel.prototype._addOptionToFilesSelect):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• English.lproj/localizedStrings.js (modified) (previous)
• inspector/front-end/ScriptsPanel.js (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-21  Pavel Feldman  <pfeldman@google.com>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: group content scripts in the scripts panel drop down.
+        https://bugs.webkit.org/show_bug.cgi?id=59108
+
+        * English.lproj/localizedStrings.js:
+        * inspector/front-end/ScriptsPanel.js:
+        (WebInspector.ScriptsPanel.prototype._addOptionToFilesSelect.optionCompare):
+        (WebInspector.ScriptsPanel.prototype._addOptionToFilesSelect):
+
 2011-04-22  Mike West  <mkwst@google.com>
 

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

@@ -280 +280 @@
         var option = document.createElement("option");
         option.text = sourceFile.url ? WebInspector.displayNameForURL(sourceFile.url) : WebInspector.UIString("(program)");
+        option.isContentScript = sourceFile.isContentScript;
         if (sourceFile.isContentScript)
             option.addStyleClass("extension-script");
         function optionCompare(a, b)
         {
+            if (a === select.contentScriptSection)
+                return b.isContentScript ? -1 : 1;
+            if (b === select.contentScriptSection)
+                return a.isContentScript ? 1 : -1;
+
+            if (a.isContentScript && !b.isContentScript)
+                return 1; 
+            if (!a.isContentScript && b.isContentScript)
+                return -1; 
+
             if (a.text === b.text)
                 return 0;
             return a.text < b.text ? -1 : 1;
         }
+
         var insertionIndex = insertionIndexForObjectInListSortedByFunction(option, select.childNodes, optionCompare);
-        if (insertionIndex < 0)
-            select.appendChild(option);
-        else
-            select.insertBefore(option, select.childNodes.item(insertionIndex));
-
+        select.insertBefore(option, insertionIndex < 0 ? null : select.childNodes.item(insertionIndex));
+
+        if (sourceFile.isContentScript && !select.contentScriptSection) {
+            var contentScriptSection = document.createElement("option");
+            contentScriptSection.text = WebInspector.UIString("Content scripts");
+            contentScriptSection.disabled = true;
+            select.contentScriptSection = contentScriptSection;
+
+            var insertionIndex = insertionIndexForObjectInListSortedByFunction(contentScriptSection, select.childNodes, optionCompare);
+            select.insertBefore(contentScriptSection, insertionIndex < 0 ? null : select.childNodes.item(insertionIndex));
+        }
         option._sourceFileId = sourceFileId;
         this._sourceFileIdToFilesSelectOption[sourceFileId] = option;