Changeset 95716 in webkit

Timestamp:

Sep 22, 2011 6:43:23 AM (13 years ago)

Author:

vsevik@chromium.org

Message:

Web Inspector: Console is always scrolled to the top
​https://bugs.webkit.org/show_bug.cgi?id=67483

Reviewed by Pavel Feldman.

• inspector/front-end/ConsoleView.js:

(WebInspector.ConsoleView.prototype.wasShown):
(WebInspector.ConsoleView.prototype.storeScrollPositions):
(WebInspector.ConsoleView.prototype.restoreScrollPositions):
(WebInspector.ConsoleView.prototype.onResize):
(WebInspector.ConsoleView.prototype._immediatelyScrollIntoView):
(WebInspector.ConsoleView.prototype._cancelScheduledScrollIntoView):
(WebInspector.ConsoleView.prototype._consoleCleared):

• inspector/front-end/Drawer.js:

(WebInspector.Drawer.prototype.hide):
(WebInspector.Drawer.prototype.resize):
(WebInspector.Drawer.prototype._startStatusBarDragging):
(WebInspector.Drawer.prototype._statusBarDragging):

• inspector/front-end/inspector.js:

(WebInspector.animateStyle):
(WebInspector.animateStyle.forceComplete):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/ConsoleView.js (modified) (4 diffs)
• inspector/front-end/Drawer.js (modified) (7 diffs)
• inspector/front-end/inspector.js (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-22  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: Console is always scrolled to the top
+        https://bugs.webkit.org/show_bug.cgi?id=67483
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/front-end/ConsoleView.js:
+        (WebInspector.ConsoleView.prototype.wasShown):
+        (WebInspector.ConsoleView.prototype.storeScrollPositions):
+        (WebInspector.ConsoleView.prototype.restoreScrollPositions):
+        (WebInspector.ConsoleView.prototype.onResize):
+        (WebInspector.ConsoleView.prototype._immediatelyScrollIntoView):
+        (WebInspector.ConsoleView.prototype._cancelScheduledScrollIntoView):
+        (WebInspector.ConsoleView.prototype._consoleCleared):
+        * inspector/front-end/Drawer.js:
+        (WebInspector.Drawer.prototype.hide):
+        (WebInspector.Drawer.prototype.resize):
+        (WebInspector.Drawer.prototype._startStatusBarDragging):
+        (WebInspector.Drawer.prototype._statusBarDragging):
+        * inspector/front-end/inspector.js:
+        (WebInspector.animateStyle):
+        (WebInspector.animateStyle.forceComplete):
+
 2011-09-22  Alpha Lam  <hclam@chromium.org>
 

trunk/Source/WebCore/inspector/front-end/ConsoleView.js

@@ -227 +227 @@
     wasShown: function()
     {
+        WebInspector.View.prototype.wasShown.call(this);
         if (!this.prompt.isCaretInsidePrompt())
             this.prompt.moveCaretToEndOfPrompt();
@@ -236 +237 @@
     },
 
+    storeScrollPositions: function()
+    {
+        WebInspector.View.prototype.storeScrollPositions.call(this);
+        this._scrolledToBottom = this.messagesElement.isScrolledToBottom();
+    },
+
+    restoreScrollPositions: function()
+    {
+        if (this._scrolledToBottom)
+            this._immediatelyScrollIntoView();
+        else
+            WebInspector.View.prototype.restoreScrollPositions.call(this);
+    },
+
+    onResize: function()
+    {
+        this.restoreScrollPositions();
+    },
+
     _isScrollIntoViewScheduled: function()
     {
@@ -252 +272 @@
         }
         this._scrollIntoViewTimer = setTimeout(scrollIntoView.bind(this), 20);
+    },
+
+    _immediatelyScrollIntoView: function()
+    {
+        this.promptElement.scrollIntoView(true);
+        this._cancelScheduledScrollIntoView();
+    },
+
+    _cancelScheduledScrollIntoView: function()
+    {
+        if (!this._isScrollIntoViewScheduled())
+            return;
+
+        clearTimeout(this._scrollIntoViewTimer);
+        delete this._scrollIntoViewTimer;
     },
 
@@ -287 +322 @@
     _consoleCleared: function()
     {
+        this._scrolledToBottom = true;
         this.messages = [];
 

trunk/Source/WebCore/inspector/front-end/Drawer.js

@@ -59 +59 @@
     show: function(view, immediately)
     {
+        this.immediatelyFinishAnimation();
+
         var drawerWasVisible = this.visible;
-
-        this.immediatelyFinishAnimation();
+        
         if (this._view)
             this.element.removeChild(this._view.element);
 
         this._view = view;
-        this._view.show(this.element);
 
         var statusBarItems = this._view.statusBarItems || [];
@@ -76 +76 @@
 
         document.body.addStyleClass("drawer-visible");
+
+        this._view.show(this.element);
 
         var anchoredItems = document.getElementById("anchored-status-bar-items");
@@ -121 +123 @@
         this._savedHeight = this.element.offsetHeight;
 
-        this.element.removeChild(this._view.element);
-        delete this._view;
-
         if (this.element === WebInspector.currentFocusElement || this.element.isAncestor(WebInspector.currentFocusElement))
             WebInspector.currentFocusElement = WebInspector.previousFocusElement;
@@ -162 +161 @@
             }
 
+            this._view.hide();
+            this.element.removeChild(this._view.element);
+            delete this._view;
             document.body.removeStyleClass("drawer-visible");
             delete this._currentAnimation;
@@ -176 +178 @@
             return;
 
+        this._view.storeScrollPositions();
         var height = this._constrainHeight(parseInt(this.element.style.height));
         this._mainElement.style.bottom = height + "px";
@@ -227 +230 @@
             return;
 
+        this._view.storeScrollPositions();
         WebInspector.elementDragStart(this._mainStatusBar, this._statusBarDragging.bind(this), this._endStatusBarDragging.bind(this), event, "row-resize");
 
@@ -243 +247 @@
         if (WebInspector.currentPanel())
             WebInspector.currentPanel().doResize();
+        this._view.doResize();
 
         event.preventDefault();

trunk/Source/WebCore/inspector/front-end/inspector.js

@@ -918 +918 @@
     function animateLoop()
     {
+        if (hasCompleted)
+            return;
+        
         // Advance forward.
         complete += intervalDuration;
@@ -954 +957 @@
     function forceComplete()
     {
-        if (!hasCompleted) {
-            complete = duration;
-            animateLoop();
-        }
+        if (hasCompleted)
+            return;
+
+        complete = duration;
+        animateLoop();
     }