Title: [96804] trunk/Source/WebCore
- Revision
- 96804
- Author
- pfeld...@chromium.org
- Date
- 2011-10-06 06:04:45 -0700 (Thu, 06 Oct 2011)
Log Message
Web Inspector: Inspector fails to start if there was at least one watch _expression_.
https://bugs.webkit.org/show_bug.cgi?id=69516
Reviewed by Yury Semikhatsky.
* inspector/front-end/ConsoleView.js:
* inspector/front-end/WatchExpressionsSidebarPane.js:
(WebInspector.WatchExpressionsSidebarPane):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (96803 => 96804)
--- trunk/Source/WebCore/ChangeLog 2011-10-06 12:53:39 UTC (rev 96803)
+++ trunk/Source/WebCore/ChangeLog 2011-10-06 13:04:45 UTC (rev 96804)
@@ -1,3 +1,14 @@
+2011-10-06 Pavel Feldman <pfeld...@google.com>
+
+ Web Inspector: Inspector fails to start if there was at least one watch _expression_.
+ https://bugs.webkit.org/show_bug.cgi?id=69516
+
+ Reviewed by Yury Semikhatsky.
+
+ * inspector/front-end/ConsoleView.js:
+ * inspector/front-end/WatchExpressionsSidebarPane.js:
+ (WebInspector.WatchExpressionsSidebarPane):
+
2011-10-06 Dominic Cooney <domin...@chromium.org>
Don't make virtual calls in Node::parentNode.
Modified: trunk/Source/WebCore/inspector/front-end/WatchExpressionsSidebarPane.js (96803 => 96804)
--- trunk/Source/WebCore/inspector/front-end/WatchExpressionsSidebarPane.js 2011-10-06 12:53:39 UTC (rev 96803)
+++ trunk/Source/WebCore/inspector/front-end/WatchExpressionsSidebarPane.js 2011-10-06 13:04:45 UTC (rev 96804)
@@ -31,20 +31,6 @@
WebInspector.WatchExpressionsSidebarPane = function()
{
WebInspector.SidebarPane.call(this, WebInspector.UIString("Watch Expressions"));
-
- this.section = new WebInspector.WatchExpressionsSection();
- this.bodyElement.appendChild(this.section.element);
-
- var refreshButton = document.createElement("button");
- refreshButton.className = "pane-title-button refresh";
- refreshButton.addEventListener("click", this._refreshButtonClicked.bind(this), false);
- this.titleElement.appendChild(refreshButton);
-
- var addButton = document.createElement("button");
- addButton.className = "pane-title-button add";
- addButton.addEventListener("click", this._addButtonClicked.bind(this), false);
- this.titleElement.appendChild(addButton);
- this._requiresUpdate = true;
}
WebInspector.WatchExpressionsSidebarPane.prototype = {
@@ -53,11 +39,29 @@
this._visible = true;
// Expand and update watches first time they are shown.
- if (!this._wasShown && WebInspector.settings.watchExpressions.get().length > 0)
- this.expanded = true;
+ if (this._wasShown) {
+ this._refreshExpressionsIfNeeded();
+ return;
+ }
- this._refreshExpressionsIfNeeded();
this._wasShown = true;
+
+ this.section = new WebInspector.WatchExpressionsSection();
+ this.bodyElement.appendChild(this.section.element);
+
+ var refreshButton = document.createElement("button");
+ refreshButton.className = "pane-title-button refresh";
+ refreshButton.addEventListener("click", this._refreshButtonClicked.bind(this), false);
+ this.titleElement.appendChild(refreshButton);
+
+ var addButton = document.createElement("button");
+ addButton.className = "pane-title-button add";
+ addButton.addEventListener("click", this._addButtonClicked.bind(this), false);
+ this.titleElement.appendChild(addButton);
+ this._requiresUpdate = true;
+
+ if (WebInspector.settings.watchExpressions.get().length > 0)
+ this.expanded = true;
},
hide: function()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
