[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
timothy at apple.com
timothy at apple.com
Wed Dec 22 18:41:46 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 5956caeadfc557704149ab746401c9f950faa320
Author: timothy at apple.com <timothy at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 15 23:41:22 2010 +0000
Fix a regression where the Web Inspector console would be empty
if the Inspector is localized.
https://bugs.webkit.org/show_bug.cgi?id=51145
Reviewed by Joseph Pecoraro.
* inspector/front-end/ConsoleView.js:
(WebInspector.ConsoleView.createFilterElement): Add a label argument so the UI string
is separate from the classname. Code clean up.
(WebInspector.ConsoleView.prototype.filter): Remove toLowerCase and use string compare.
(WebInspector.ConsoleView): Pass separate classnames and labels to createFilterElement.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74153 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4fd7850..34d5f42 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-12-15 Timothy Hatcher <timothy at apple.com>
+
+ Fix a regression where the Web Inspector console would be empty
+ if the Inspector is localized.
+
+ https://bugs.webkit.org/show_bug.cgi?id=51145
+
+ Reviewed by Joseph Pecoraro.
+
+ * inspector/front-end/ConsoleView.js:
+ (WebInspector.ConsoleView.createFilterElement): Add a label argument so the UI string
+ is separate from the classname. Code clean up.
+ (WebInspector.ConsoleView.prototype.filter): Remove toLowerCase and use string compare.
+ (WebInspector.ConsoleView): Pass separate classnames and labels to createFilterElement.
+
2010-12-15 Simon Fraser <simon.fraser at apple.com>
Reviewed by Adele Peterson.
diff --git a/WebCore/inspector/front-end/ConsoleView.js b/WebCore/inspector/front-end/ConsoleView.js
index f0df010..a582bfb 100644
--- a/WebCore/inspector/front-end/ConsoleView.js
+++ b/WebCore/inspector/front-end/ConsoleView.js
@@ -68,24 +68,23 @@ WebInspector.ConsoleView = function(drawer)
}
var updateFilterHandler = this._updateFilter.bind(this);
- function createFilterElement(category) {
+ function createFilterElement(category, label) {
var categoryElement = document.createElement("li");
categoryElement.category = category;
- categoryElement.addStyleClass(categoryElement.category);
+ categoryElement.className = category;
categoryElement.addEventListener("click", updateFilterHandler, false);
-
- var label = category.toString();
- categoryElement.appendChild(document.createTextNode(label));
+ categoryElement.textContent = label;
this.filterBarElement.appendChild(categoryElement);
+
return categoryElement;
}
- this.allElement = createFilterElement.call(this, WebInspector.UIString("All"));
+ this.allElement = createFilterElement.call(this, "all", WebInspector.UIString("All"));
createDividerElement.call(this);
- this.errorElement = createFilterElement.call(this, WebInspector.UIString("Errors"));
- this.warningElement = createFilterElement.call(this, WebInspector.UIString("Warnings"));
- this.logElement = createFilterElement.call(this, WebInspector.UIString("Logs"));
+ this.errorElement = createFilterElement.call(this, "errors", WebInspector.UIString("Errors"));
+ this.warningElement = createFilterElement.call(this, "warnings", WebInspector.UIString("Warnings"));
+ this.logElement = createFilterElement.call(this, "logs", WebInspector.UIString("Logs"));
this.filter(this.allElement, false);
this._registerShortcuts();
@@ -128,9 +127,9 @@ WebInspector.ConsoleView.prototype = {
this.messagesElement.removeStyleClass("filter-logs");
}
- var targetFilterClass = "filter-" + target.category.toLowerCase();
+ var targetFilterClass = "filter-" + target.category;
- if (target.category == "All") {
+ if (target.category === "all") {
if (target.hasStyleClass("selected")) {
// We can't unselect all, so we break early here
return;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list