[webkit-changes] [181518] trunk/Source/WebInspectorUI

Sun, 15 Mar 2015 17:41:54 -0700

Title: [181518] trunk/Source/WebInspectorUI
Revision
181518
Author
nvasil...@apple.com
Date
2015-03-15 17:40:59 -0700 (Sun, 15 Mar 2015)

Log 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):

Modified Paths

Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (181517 => 181518)


--- trunk/Source/WebInspectorUI/ChangeLog	2015-03-16 00:19:49 UTC (rev 181517)
+++ trunk/Source/WebInspectorUI/ChangeLog	2015-03-16 00:40:59 UTC (rev 181518)
@@ -1,5 +1,21 @@
 2015-03-15  Nikita Vasilyev  <nvasil...@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  <nvasil...@apple.com>
+
         Web Inspector: Rename ConsoleMessage and ConsoleMessageImpl to LegacyConsoleMessage and LegacyConsoleMessageImpl respectively
         https://bugs.webkit.org/show_bug.cgi?id=142712

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js (181517 => 181518)


--- trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js	2015-03-16 00:19:49 UTC (rev 181517)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js	2015-03-16 00:40:59 UTC (rev 181518)
@@ -421,9 +421,9 @@
         selection.removeAllRanges();
 
         if (!this._mouseMoveIsRowSelection)
-            this._updateMessagesSelection(this._mouseDownWrapper, this._mouseDownCommandKey, this._mouseDownShiftKey);
+            this._updateMessagesSelection(this._mouseDownWrapper, this._mouseDownCommandKey, this._mouseDownShiftKey, false);
 
-        this._updateMessagesSelection(wrapper, false, true);
+        this._updateMessagesSelection(wrapper, false, true, false);
 
         this._mouseMoveIsRowSelection = true;
 
@@ -444,7 +444,7 @@
 
             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) {
             // There is a text selection, clear the row selection.
@@ -483,7 +483,7 @@
         }
     },
 
-    _updateMessagesSelection: function(message, multipleSelection, rangeSelection)
+    _updateMessagesSelection: function(message, multipleSelection, rangeSelection, shouldScrollIntoView)
     {
         var alreadySelectedMessage = this._selectedMessages.contains(message);
         if (alreadySelectedMessage && this._selectedMessages.length && multipleSelection) {
@@ -529,7 +529,7 @@
         if (!rangeSelection)
             this._referenceMessageForRangeSelection = message;
 
-        if (!alreadySelectedMessage)
+        if (shouldScrollIntoView && !alreadySelectedMessage)
             this._ensureMessageIsVisible(this._selectedMessages.lastValue);
     },
 
@@ -751,17 +751,17 @@
 
         if (!this._selectedMessages.length) {
             if (messages.length)
-                this._updateMessagesSelection(messages.lastValue, false, false);
+                this._updateMessagesSelection(messages.lastValue, false, false, true);
             return;
         }
 
         var lastMessage = this._selectedMessages.lastValue;
         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);
         }
 
         event.preventDefault();
@@ -773,17 +773,17 @@
 
         if (!this._selectedMessages.length) {
             if (messages.length)
-                this._updateMessagesSelection(messages[0], false, false);
+                this._updateMessagesSelection(messages[0], false, false, true);
             return;
         }
 
         var lastMessage = this._selectedMessages.lastValue;
         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);
         }
 
         event.preventDefault();

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to