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();