Title: [92842] trunk
- Revision
- 92842
- Author
- [email protected]
- Date
- 2011-08-11 06:59:08 -0700 (Thu, 11 Aug 2011)
Log Message
Web Inspector: [Mac] search as you type does not work with the new indent in the script selector.
https://bugs.webkit.org/show_bug.cgi?id=66039
Reviewed by Yury Semikhatsky.
Source/WebCore:
* inspector/front-end/ScriptsPanel.js:
(WebInspector.ScriptsPanel.prototype._addOptionToFilesSelect):
* inspector/front-end/inspector.css:
(select.status-bar-item):
LayoutTests:
* inspector/debugger/scripts-panel-expected.txt:
* platform/chromium/inspector/debugger/scripts-sorting-expected.txt:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (92841 => 92842)
--- trunk/LayoutTests/ChangeLog 2011-08-11 12:45:44 UTC (rev 92841)
+++ trunk/LayoutTests/ChangeLog 2011-08-11 13:59:08 UTC (rev 92842)
@@ -1,3 +1,13 @@
+2011-08-11 Pavel Feldman <[email protected]>
+
+ Web Inspector: [Mac] search as you type does not work with the new indent in the script selector.
+ https://bugs.webkit.org/show_bug.cgi?id=66039
+
+ Reviewed by Yury Semikhatsky.
+
+ * inspector/debugger/scripts-panel-expected.txt:
+ * platform/chromium/inspector/debugger/scripts-sorting-expected.txt:
+
2011-08-11 Zsolt Fehér <[email protected]>
[WK2] Implement waitForPolicyDelegate
Modified: trunk/LayoutTests/inspector/debugger/scripts-panel-expected.txt (92841 => 92842)
--- trunk/LayoutTests/inspector/debugger/scripts-panel-expected.txt 2011-08-11 12:45:44 UTC (rev 92841)
+++ trunk/LayoutTests/inspector/debugger/scripts-panel-expected.txt 2011-08-11 13:59:08 UTC (rev 92842)
@@ -4,9 +4,9 @@
Running: testInitialLoad
Source requested for foo.js
Dump files select:
- bar.js
- baz.js
- foo.js
+ bar.js
+ baz.js
+ foo.js
Source requested for baz.js
Running: testHistory
@@ -16,21 +16,21 @@
Source requested for script3.js
Running: testFilesSelect
- ?a=b(?a=b)
- ...oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_url(very_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_url)
-example.com
- ?a=b(http://example.com/?a=b)
-localhost
+ ?a=b(?a=b)
+ ...oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_url(very_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_url)
+— example.com —
+ ?a=b(http://example.com/?a=b)
+— localhost —
LayoutTests/inspector/debugger/foo/bar
- script.js(<root>/foo/bar/script.js)
- script.js?a=1(<root>/foo/bar/script.js?a=1)
- script.js?a=2(<root>/foo/bar/script.js?a=2)
+ script.js(<root>/foo/bar/script.js)
+ script.js?a=1(<root>/foo/bar/script.js?a=1)
+ script.js?a=2(<root>/foo/bar/script.js?a=2)
LayoutTests/inspector/debugger/foo/baz
- script.js(<root>/foo/baz/script.js)
-Content scripts
- contentScript.js?a=1(<root>/foo/bar/contentScript.js?a=1)
- contentScript.js?a=2(<root>/foo/bar/contentScript.js?a=2)
- contentScript2.js?a=1(<root>/foo/bar/contentScript2.js?a=1)
+ script.js(<root>/foo/baz/script.js)
+— Content scripts —
+ contentScript.js?a=1(<root>/foo/bar/contentScript.js?a=1)
+ contentScript.js?a=2(<root>/foo/bar/contentScript.js?a=2)
+ contentScript2.js?a=1(<root>/foo/bar/contentScript2.js?a=1)
Running: testSourceReplaced
Source requested for foo.js
Modified: trunk/LayoutTests/platform/chromium/inspector/debugger/scripts-sorting-expected.txt (92841 => 92842)
--- trunk/LayoutTests/platform/chromium/inspector/debugger/scripts-sorting-expected.txt 2011-08-11 12:45:44 UTC (rev 92841)
+++ trunk/LayoutTests/platform/chromium/inspector/debugger/scripts-sorting-expected.txt 2011-08-11 13:59:08 UTC (rev 92842)
@@ -1,19 +1,19 @@
Tests scripts sorting in the scripts panel.
Debugger was enabled.
- *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
+ *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.
Modified: trunk/Source/WebCore/ChangeLog (92841 => 92842)
--- trunk/Source/WebCore/ChangeLog 2011-08-11 12:45:44 UTC (rev 92841)
+++ trunk/Source/WebCore/ChangeLog 2011-08-11 13:59:08 UTC (rev 92842)
@@ -1,3 +1,15 @@
+2011-08-11 Pavel Feldman <[email protected]>
+
+ Web Inspector: [Mac] search as you type does not work with the new indent in the script selector.
+ https://bugs.webkit.org/show_bug.cgi?id=66039
+
+ Reviewed by Yury Semikhatsky.
+
+ * inspector/front-end/ScriptsPanel.js:
+ (WebInspector.ScriptsPanel.prototype._addOptionToFilesSelect):
+ * inspector/front-end/inspector.css:
+ (select.status-bar-item):
+
2011-08-11 Alexis Menard <[email protected]>
Unreviewed build fix for Qt.
Modified: trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js (92841 => 92842)
--- trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js 2011-08-11 12:45:44 UTC (rev 92841)
+++ trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js 2011-08-11 13:59:08 UTC (rev 92842)
@@ -266,8 +266,8 @@
var parsedURL = sourceFile.url.asParsedURL();
var names = this._folderAndDisplayNameForScriptURL(sourceFile.url);
- const indent = "\u00a0\u00a0\u00a0\u00a0";
- option.text = names.displayName ? indent + indent + names.displayName : WebInspector.UIString("(program)");
+ const indent = WebInspector.isMac() ? "" : "\u00a0\u00a0\u00a0\u00a0";
+ option.text = indent + (names.displayName ? names.displayName : WebInspector.UIString("(program)"));
option.scriptNameForTest = names.displayName;
var folderNameForSorting;
@@ -295,7 +295,7 @@
if (sourceFile.isContentScript && !select.contentScriptSection) {
var contentScriptSection = document.createElement("option");
- contentScriptSection.text = WebInspector.UIString("Content scripts");
+ contentScriptSection.text = "\u2014 " + WebInspector.UIString("Content scripts") + " \u2014";
contentScriptSection.disabled = true;
contentScriptSection.nameForSorting = "1/ContentScriptSeparator";
select.contentScriptSection = contentScriptSection;
@@ -304,7 +304,7 @@
if (!sourceFile.isContentScript && names.domain && !select.domainOptions[names.domain]) {
var domainOption = document.createElement("option");
- domainOption.text = names.domain;
+ domainOption.text = "\u2014 " + names.domain + " \u2014";
domainOption.nameForSorting = "0:" + names.domain;
domainOption.disabled = true;
select.domainOptions[names.domain] = domainOption;
@@ -313,7 +313,7 @@
if (names.folderName && !select.folderOptions[names.folderName]) {
var folderOption = document.createElement("option");
- folderOption.text = indent + names.folderName;
+ folderOption.text = names.folderName;
folderOption.nameForSorting = folderNameForSorting;
folderOption.disabled = true;
select.folderOptions[names.folderName] = folderOption;
Modified: trunk/Source/WebCore/inspector/front-end/inspector.css (92841 => 92842)
--- trunk/Source/WebCore/inspector/front-end/inspector.css 2011-08-11 12:45:44 UTC (rev 92841)
+++ trunk/Source/WebCore/inspector/front-end/inspector.css 2011-08-11 13:59:08 UTC (rev 92842)
@@ -491,7 +491,7 @@
select.status-bar-item {
min-width: 48px;
border-width: 0 17px 0 2px;
- padding: 0 2px 0 0;
+ padding: 0 2px 0 6px;
font-weight: bold;
color: rgb(48, 48, 48);
text-shadow: rgba(255, 255, 255, 0.75) 0 1px 0;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
