[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf
eric at webkit.org
eric at webkit.org
Wed Jan 6 00:09:44 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 974cfe4fa51f2cf936427f40a2b8697522360344
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Dec 29 19:55:59 2009 +0000
2009-12-29 Alexander Pavlov <apavlov at chromium.org>
Reviewed by Pavel Feldman.
Fix UI nits in the Audits panel.
https://bugs.webkit.org/show_bug.cgi?id=32932
* inspector/front-end/AuditLauncherView.js:
(WebInspector.AuditLauncherView.prototype._selectAllClicked):
(WebInspector.AuditLauncherView.prototype._createCategoryElement):
(WebInspector.AuditLauncherView.prototype._createLauncherUI.handleSelectAllClick):
(WebInspector.AuditLauncherView.prototype._createLauncherUI):
* inspector/front-end/AuditResultView.js:
(WebInspector.AuditResultView):
(WebInspector.AuditRuleResultPane):
* inspector/front-end/audits.css:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52629 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d75ad29..b5c33c7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2009-12-29 Alexander Pavlov <apavlov at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Fix UI nits in the Audits panel.
+ https://bugs.webkit.org/show_bug.cgi?id=32932
+
+ * inspector/front-end/AuditLauncherView.js:
+ (WebInspector.AuditLauncherView.prototype._selectAllClicked):
+ (WebInspector.AuditLauncherView.prototype._createCategoryElement):
+ (WebInspector.AuditLauncherView.prototype._createLauncherUI.handleSelectAllClick):
+ (WebInspector.AuditLauncherView.prototype._createLauncherUI):
+ * inspector/front-end/AuditResultView.js:
+ (WebInspector.AuditResultView):
+ (WebInspector.AuditRuleResultPane):
+ * inspector/front-end/audits.css:
+
2009-12-29 Johnny Ding <jnd at chromium.org>
Reviewed by Dimitri Glazkov.
diff --git a/WebCore/inspector/front-end/AuditLauncherView.js b/WebCore/inspector/front-end/AuditLauncherView.js
index 2fee1d8..79fbb92 100644
--- a/WebCore/inspector/front-end/AuditLauncherView.js
+++ b/WebCore/inspector/front-end/AuditLauncherView.js
@@ -103,13 +103,12 @@ WebInspector.AuditLauncherView.prototype = {
this._runnerCallback(catIds, this._auditPresentStateElement.checked, profilingFinishedCallback.bind(this));
},
- _selectAllClicked: function(event)
+ _selectAllClicked: function(checkCategories)
{
- var shouldCheckCategoriesOn = event.target.checked;
var childNodes = this._categoriesElement.childNodes;
for (var i = 0, length = childNodes.length; i < length; ++i)
- childNodes[i].firstChild.checked = shouldCheckCategoriesOn;
- this._currentCategoriesCount = shouldCheckCategoriesOn ? this._totalCategoriesCount : 0;
+ childNodes[i].firstChild.checked = checkCategories;
+ this._currentCategoriesCount = checkCategories ? this._totalCategoriesCount : 0;
this._updateButton();
},
@@ -129,7 +128,6 @@ WebInspector.AuditLauncherView.prototype = {
element = document.createElement("input");
element.type = "checkbox";
labelElement.appendChild(element);
-
labelElement.appendChild(document.createTextNode(title));
return labelElement;
@@ -141,10 +139,15 @@ WebInspector.AuditLauncherView.prototype = {
this._headerElement.textContent = WebInspector.UIString("Select audits to run");
this._contentElement.appendChild(this._headerElement);
+ function handleSelectAllClick(event)
+ {
+ this._selectAllClicked(event.target.checked);
+ }
var categoryElement = this._createCategoryElement(WebInspector.UIString("Select All"), "");
categoryElement.id = "audit-launcher-selectall";
this._selectAllCheckboxElement = categoryElement.firstChild;
- this._selectAllCheckboxElement.addEventListener("click", this._selectAllClicked.bind(this), false);
+ this._selectAllCheckboxElement.checked = true;
+ this._selectAllCheckboxElement.addEventListener("click", handleSelectAllClick.bind(this), false);
this._contentElement.appendChild(categoryElement);
this._categoriesElement = document.createElement("div");
@@ -191,6 +194,7 @@ WebInspector.AuditLauncherView.prototype = {
this._contentElement.appendChild(this._buttonContainerElement);
+ this._selectAllClicked(this._selectAllCheckboxElement.checked);
this.updateResourceTrackingState();
this._updateButton();
this.resize();
diff --git a/WebCore/inspector/front-end/AuditResultView.js b/WebCore/inspector/front-end/AuditResultView.js
index b2a0f1a..ac818fb 100644
--- a/WebCore/inspector/front-end/AuditResultView.js
+++ b/WebCore/inspector/front-end/AuditResultView.js
@@ -32,11 +32,7 @@ WebInspector.AuditResultView = function(categoryResults)
{
WebInspector.View.call(this);
- this.element.addStyleClass("audit-result-view");
-
- this.resultBarElement = document.createElement("div");
- this.resultBarElement.id = "audit-resultbar";
- this.element.appendChild(this.resultBarElement);
+ this.element.id = "audit-result-view";
function entrySortFunction(a, b)
{
@@ -50,7 +46,7 @@ WebInspector.AuditResultView = function(categoryResults)
var entries = categoryResults[i].entries;
if (entries) {
entries.sort(entrySortFunction);
- this.resultBarElement.appendChild(new WebInspector.AuditCategoryResultPane(categoryResults[i]).element);
+ this.element.appendChild(new WebInspector.AuditCategoryResultPane(categoryResults[i]).element);
}
}
}
@@ -79,7 +75,6 @@ WebInspector.AuditRuleResultPane = function(ruleResult)
for (var i = 0; i < ruleResult.children.length; ++i) {
var section = new WebInspector.AuditRuleResultChildSection(ruleResult.children[i]);
- section.expand();
this.bodyElement.appendChild(section.element);
}
}
diff --git a/WebCore/inspector/front-end/audits.css b/WebCore/inspector/front-end/audits.css
index 1bcd808..35db76b 100644
--- a/WebCore/inspector/front-end/audits.css
+++ b/WebCore/inspector/front-end/audits.css
@@ -50,7 +50,7 @@ button.clear-audit-results-status-bar-item .glyph {
-webkit-mask-image: url(Images/clearConsoleButtonGlyph.png);
}
-.audit-result-view {
+#audit-result-view {
display: none;
overflow: auto;
position: absolute;
@@ -58,25 +58,16 @@ button.clear-audit-results-status-bar-item .glyph {
left: 0;
right: 0;
bottom: 0;
-}
-
-.audit-result-view.visible {
- display: block;
-}
-
-#audit-resultbar {
- position: absolute;
- top: 0;
- right: 0;
- bottom: 0;
- width: 100%;
background-color: rgb(245, 245, 245);
- border-left: 1px solid rgb(64%, 64%, 64%);
cursor: default;
overflow: auto;
}
-#audit-resultbar > .pane img.score {
+#audit-result-view.visible {
+ display: block;
+}
+
+#audit-result-view > .pane img.score {
float: left;
margin-top: 2px;
position: relative;
@@ -85,65 +76,69 @@ button.clear-audit-results-status-bar-item .glyph {
z-index: 100;
}
-#audit-resultbar > .pane img.score.red {
+#audit-result-view > .pane img.score.red {
content: url(Images/errorRedDot.png);
}
-#audit-resultbar > .pane img.score.green {
+#audit-result-view > .pane img.score.green {
content: url(Images/successGreenDot.png);
}
-#audit-resultbar > .pane > .body > .pane:nth-of-type(2n) {
- background-color: rgba(0, 0, 0, 0.05);
+#audit-result-view > .pane.expanded:nth-last-of-type(1) {
+ border-bottom: 1px solid rgb(189, 189, 189) !important;
+}
+
+#audit-result-view .pane.expanded:nth-last-of-type(1) {
+ border-bottom: 0px transparent none;
}
-#audit-resultbar > .pane > .body > .pane > .title {
+#audit-result-view > .pane > .body > .pane > .title {
padding-left: 16px;
background-image: none;
border-bottom: none;
}
-#audit-resultbar > .pane > .body > .pane > .body {
+#audit-result-view > .pane > .body > .pane > .body {
background-color: transparent;
}
-#audit-resultbar > .pane > .body > .pane .section {
+#audit-result-view > .pane > .body > .pane .section {
margin-left: 16px;
}
-#audit-resultbar .section .header {
+#audit-result-view .section .header {
border: 0;
background-image: none;
background-color: transparent;
}
-#audit-resultbar .section .header > .title {
+#audit-result-view .section .header > .title {
color: rgb(0, 0, 0);
}
-#audit-resultbar .section .section-content {
+#audit-result-view .section .section-content {
width: 100%;
padding-left: 18px;
display: none;
}
-#audit-resultbar .section.expanded .section-content {
+#audit-result-view .section.expanded .section-content {
display: block;
}
-#audit-resultbar .section.expanded .section-content > p:nth-of-type(1) {
+#audit-result-view .section.expanded .section-content > p:nth-of-type(1) {
margin-top: 0;
}
-#audit-resultbar .section.expanded .section-content > p:nth-of-type(1) > *:nth-child(1) {
+#audit-result-view .section.expanded .section-content > p:nth-of-type(1) > *:nth-child(1) {
margin-top: 0;
}
-#audit-resultbar .section .header::before {
+#audit-result-view .section .header::before {
content: url(Images/treeRightTriangleBlack.png);
}
-#audit-resultbar .section.expanded .header::before {
+#audit-result-view .section.expanded .header::before {
content: url(Images/treeDownTriangleBlack.png);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list