Title: [89348] trunk/Source/WebCore
- Revision
- 89348
- Author
- apav...@chromium.org
- Date
- 2011-06-21 05:38:00 -0700 (Tue, 21 Jun 2011)
Log Message
2011-06-21 Alexander Pavlov <apav...@chromium.org>
Reviewed by Pavel Feldman.
Web Inspector: Attached state changes do not affect the drawer height
https://bugs.webkit.org/show_bug.cgi?id=63061
* inspector/front-end/Drawer.js:
(WebInspector.Drawer.prototype.enterPanelMode):
(WebInspector.Drawer.prototype.exitPanelMode):
(WebInspector.Drawer.prototype.updateHeight):
* inspector/front-end/inspector.js:
(WebInspector.set attached):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (89347 => 89348)
--- trunk/Source/WebCore/ChangeLog 2011-06-21 12:29:02 UTC (rev 89347)
+++ trunk/Source/WebCore/ChangeLog 2011-06-21 12:38:00 UTC (rev 89348)
@@ -1,3 +1,17 @@
+2011-06-21 Alexander Pavlov <apav...@chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: Attached state changes do not affect the drawer height
+ https://bugs.webkit.org/show_bug.cgi?id=63061
+
+ * inspector/front-end/Drawer.js:
+ (WebInspector.Drawer.prototype.enterPanelMode):
+ (WebInspector.Drawer.prototype.exitPanelMode):
+ (WebInspector.Drawer.prototype.updateHeight):
+ * inspector/front-end/inspector.js:
+ (WebInspector.set attached):
+
2011-06-17 Pavel Podivilov <podivi...@chromium.org>
Reviewed by Pavel Feldman.
Modified: trunk/Source/WebCore/inspector/front-end/Drawer.js (89347 => 89348)
--- trunk/Source/WebCore/inspector/front-end/Drawer.js 2011-06-21 12:29:02 UTC (rev 89347)
+++ trunk/Source/WebCore/inspector/front-end/Drawer.js 2011-06-21 12:38:00 UTC (rev 89348)
@@ -218,25 +218,30 @@
{
this._cancelAnimationIfNeeded();
this.fullPanel = true;
-
- if (this.visible) {
- this._savedHeight = this.element.offsetHeight;
- var height = window.innerHeight - this._toolbarElement.offsetHeight;
- this._animateDrawerHeight(height, WebInspector.Drawer.State.Full);
- }
+ this.updateHeight();
},
exitPanelMode: function()
{
this._cancelAnimationIfNeeded();
this.fullPanel = false;
+ this.updateHeight();
+ },
+ updateHeight: function()
+ {
if (this.visible) {
- // If this animation gets cancelled, we want the state of the drawer to be Variable,
- // so that the new animation can't do an immediate transition between Hidden/Full states.
- this.state = WebInspector.Drawer.State.Variable;
- var height = this.savedHeight;
- this._animateDrawerHeight(height, WebInspector.Drawer.State.Variable);
+ if (this.fullPanel) {
+ this._savedHeight = this.element.offsetHeight;
+ var height = window.innerHeight - this._toolbarElement.offsetHeight;
+ this._animateDrawerHeight(height, WebInspector.Drawer.State.Full);
+ } else {
+ // If this animation gets cancelled, we want the state of the drawer to be Variable,
+ // so that the new animation can't do an immediate transition between Hidden/Full states.
+ this.state = WebInspector.Drawer.State.Variable;
+ var height = this.savedHeight;
+ this._animateDrawerHeight(height, WebInspector.Drawer.State.Variable);
+ }
}
},
Modified: trunk/Source/WebCore/inspector/front-end/inspector.js (89347 => 89348)
--- trunk/Source/WebCore/inspector/front-end/inspector.js 2011-06-21 12:29:02 UTC (rev 89347)
+++ trunk/Source/WebCore/inspector/front-end/inspector.js 2011-06-21 12:38:00 UTC (rev 89348)
@@ -209,6 +209,9 @@
if (WebInspector.searchController)
WebInspector.searchController.updateSearchLabel();
+
+ if (WebInspector.drawer)
+ WebInspector.drawer.updateHeight();
},
get errors()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
