Changeset 181518 in webkit

Timestamp:

Mar 15, 2015, 5:40:59 PM (11 years ago)

Author:

Nikita Vasilyev

Message:

Web Inspector: Console Scrolls Unexpectedly when Clicking inside un-selected Expanding Object
​https://bugs.webkit.org/show_bug.cgi?id=142655

Don't scroll when selection change is triggered by clicking, e.g.
only scroll on arrow up and down key press events.

Reviewed by Joseph Pecoraro.

• UserInterface/Views/LogContentView.js:

(WebInspector.LogContentView.prototype._mousemove):
(WebInspector.LogContentView.prototype._updateMessagesSelection):
(WebInspector.LogContentView.prototype._upArrowWasPressed):
(WebInspector.LogContentView.prototype._downArrowWasPressed):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/LogContentView.js (modified) (8 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2015-03-15  Nikita Vasilyev  <nvasilyev@apple.com>
+
+        Web Inspector: Console Scrolls Unexpectedly when Clicking inside un-selected Expanding Object
+        https://bugs.webkit.org/show_bug.cgi?id=142655
+
+        Don't scroll when selection change is triggered by clicking, e.g.
+        only scroll on arrow up and down key press events.
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Views/LogContentView.js:
+        (WebInspector.LogContentView.prototype._mousemove):
+        (WebInspector.LogContentView.prototype._updateMessagesSelection):
+        (WebInspector.LogContentView.prototype._upArrowWasPressed):
+        (WebInspector.LogContentView.prototype._downArrowWasPressed):
+
 2015-03-15  Nikita Vasilyev  <nvasilyev@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js

@@ -422 +422 @@
 
         if (!this._mouseMoveIsRowSelection)
-            this._updateMessagesSelection(this._mouseDownWrapper, this._mouseDownCommandKey, this._mouseDownShiftKey);
-
-        this._updateMessagesSelection(wrapper, false, true);
+            this._updateMessagesSelection(this._mouseDownWrapper, this._mouseDownCommandKey, this._mouseDownShiftKey, false);
+
+        this._updateMessagesSelection(wrapper, false, true, false);
 
         this._mouseMoveIsRowSelection = true;
@@ -445 +445 @@
             if (this._targetInMessageCanBeSelected(event.target, wrapper)) {
                 var sameWrapper = wrapper === this._mouseDownWrapper;
-                this._updateMessagesSelection(wrapper, sameWrapper ? this._mouseDownCommandKey : false, sameWrapper ? this._mouseDownShiftKey : true);
+                this._updateMessagesSelection(wrapper, sameWrapper ? this._mouseDownCommandKey : false, sameWrapper ? this._mouseDownShiftKey : true, false);
             }
         } else if (!selection.isCollapsed) {
@@ -484 +484 @@
     },
 
-    _updateMessagesSelection: function(message, multipleSelection, rangeSelection)
+    _updateMessagesSelection: function(message, multipleSelection, rangeSelection, shouldScrollIntoView)
     {
         var alreadySelectedMessage = this._selectedMessages.contains(message);
@@ -530 +530 @@
             this._referenceMessageForRangeSelection = message;
 
-        if (!alreadySelectedMessage)
+        if (shouldScrollIntoView && !alreadySelectedMessage)
             this._ensureMessageIsVisible(this._selectedMessages.lastValue);
     },
@@ -752 +752 @@
         if (!this._selectedMessages.length) {
             if (messages.length)
-                this._updateMessagesSelection(messages.lastValue, false, false);
+                this._updateMessagesSelection(messages.lastValue, false, false, true);
             return;
         }
@@ -759 +759 @@
         var previousMessage = this._previousMessage(lastMessage);
         if (previousMessage)
-            this._updateMessagesSelection(previousMessage, false, event.shiftKey);
+            this._updateMessagesSelection(previousMessage, false, event.shiftKey, true);
         else if (!event.shiftKey) {
             this._clearMessagesSelection();
-            this._updateMessagesSelection(messages[0], false, false);
+            this._updateMessagesSelection(messages[0], false, false, true);
         }
 
@@ -774 +774 @@
         if (!this._selectedMessages.length) {
             if (messages.length)
-                this._updateMessagesSelection(messages[0], false, false);
+                this._updateMessagesSelection(messages[0], false, false, true);
             return;
         }
@@ -781 +781 @@
         var nextMessage = this._nextMessage(lastMessage);
         if (nextMessage)
-            this._updateMessagesSelection(nextMessage, false, event.shiftKey);
+            this._updateMessagesSelection(nextMessage, false, event.shiftKey, true);
         else if (!event.shiftKey) {
             this._clearMessagesSelection();
-            this._updateMessagesSelection(messages.lastValue, false, false);
+            this._updateMessagesSelection(messages.lastValue, false, false, true);
         }