Title: [97984] trunk/Source/WebCore
- Revision
- 97984
- Author
- pfeld...@chromium.org
- Date
- 2011-10-20 09:07:46 -0700 (Thu, 20 Oct 2011)
Log Message
Web Inspector: detach should call hide so that overrides are processed.
https://bugs.webkit.org/show_bug.cgi?id=70503
Reviewed by Yury Semikhatsky.
* inspector/front-end/ConsolePanel.js:
(WebInspector.ConsolePanel.prototype.hide):
* inspector/front-end/View.js:
(WebInspector.View):
(WebInspector.View.prototype.hide):
(WebInspector.View.prototype.detach):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (97983 => 97984)
--- trunk/Source/WebCore/ChangeLog 2011-10-20 15:47:57 UTC (rev 97983)
+++ trunk/Source/WebCore/ChangeLog 2011-10-20 16:07:46 UTC (rev 97984)
@@ -1,3 +1,17 @@
+2011-10-20 Pavel Feldman <pfeld...@google.com>
+
+ Web Inspector: detach should call hide so that overrides are processed.
+ https://bugs.webkit.org/show_bug.cgi?id=70503
+
+ Reviewed by Yury Semikhatsky.
+
+ * inspector/front-end/ConsolePanel.js:
+ (WebInspector.ConsolePanel.prototype.hide):
+ * inspector/front-end/View.js:
+ (WebInspector.View):
+ (WebInspector.View.prototype.hide):
+ (WebInspector.View.prototype.detach):
+
2011-10-20 Csaba Osztrogonác <o...@webkit.org>
[Qt] Roll-back r97964, r97972 and fix in https://bugs.webkit.org/show_bug.cgi?id=70328.
Modified: trunk/Source/WebCore/inspector/front-end/ConsolePanel.js (97983 => 97984)
--- trunk/Source/WebCore/inspector/front-end/ConsolePanel.js 2011-10-20 15:47:57 UTC (rev 97983)
+++ trunk/Source/WebCore/inspector/front-end/ConsolePanel.js 2011-10-20 16:07:46 UTC (rev 97984)
@@ -63,7 +63,6 @@
hide: function()
{
WebInspector.Panel.prototype.hide.call(this);
- this._view.detach();
if (this._drawerWasVisible) {
WebInspector.drawer.show(this._view, WebInspector.Drawer.AnimationType.Immediately);
delete this._drawerWasVisible;
Modified: trunk/Source/WebCore/inspector/front-end/View.js (97983 => 97984)
--- trunk/Source/WebCore/inspector/front-end/View.js 2011-10-20 15:47:57 UTC (rev 97983)
+++ trunk/Source/WebCore/inspector/front-end/View.js 2011-10-20 16:07:46 UTC (rev 97984)
@@ -36,6 +36,7 @@
this.element.__view = this;
this._visible = false;
this._children = [];
+ this._inDetach = false;
}
WebInspector.View.prototype = {
@@ -85,7 +86,8 @@
hide: function()
{
this.dispatchToSelfAndChildren("willHide", true);
- this.element.removeStyleClass("visible");
+ if (!this._inDetach)
+ this.element.removeStyleClass("visible");
this._visible = false;
},
@@ -100,8 +102,9 @@
detach: function()
{
if (this._visible) {
- this.dispatchToSelfAndChildren("willHide", true);
- this._visible = false;
+ this._inDetach = true;
+ this.hide();
+ this._inDetach = false;
}
this.dispatchToSelfAndChildren("willDetach", false);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
