Changeset 250076 in webkit

Timestamp:

Sep 18, 2019, 6:45:35 PM (6 years ago)

Author:

Joseph Pecoraro

Message:

Web Inspector: console assertion when pressing up/down in empty console log view
​https://bugs.webkit.org/show_bug.cgi?id=201948

Reviewed by Devin Rousso.

• UserInterface/Views/LogContentView.js:

(WI.LogContentView.prototype._upArrowWasPressed):
(WI.LogContentView.prototype._downArrowWasPressed):
Ensure that a message exists before calling _updateMessagesSelection, which
would assert if given a bad message. Additionally, only perform preventDefault
when selecting a message. This allows us to fall back to a system beep if
this key event does nothing.

Location:

trunk/Source/WebInspectorUI

Files:

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

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-09-18  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: console assertion when pressing up/down in empty console log view
+        https://bugs.webkit.org/show_bug.cgi?id=201948
+
+        Reviewed by Devin Rousso.
+
+        * UserInterface/Views/LogContentView.js:
+        (WI.LogContentView.prototype._upArrowWasPressed):
+        (WI.LogContentView.prototype._downArrowWasPressed):
+        Ensure that a message exists before calling `_updateMessagesSelection`, which
+        would assert if given a bad message. Additionally, only perform preventDefault
+        when selecting a message. This allows us to fall back to a system beep if
+        this key event does nothing.
+
 2019-09-17  Joseph Pecoraro  <pecoraro@apple.com>
 

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

@@ -986 +986 @@
         var lastMessage = this._selectedMessages.lastValue;
         var previousMessage = this._previousMessage(lastMessage);
-        if (previousMessage)
+        if (previousMessage) {
             this._updateMessagesSelection(previousMessage, false, event.shiftKey, true);
-        else if (!event.shiftKey) {
+            event.preventDefault();
+        } else if (!event.shiftKey) {
             this._clearMessagesSelection();
-            this._updateMessagesSelection(messages[0], false, false, true);
-        }
-
-        event.preventDefault();
+            if (messages.length) {
+                this._updateMessagesSelection(messages[0], false, false, true);
+                event.preventDefault();
+            }
+        }
     }
 
@@ -1008 +1010 @@
         var lastMessage = this._selectedMessages.lastValue;
         var nextMessage = this._nextMessage(lastMessage);
-        if (nextMessage)
+        if (nextMessage) {
             this._updateMessagesSelection(nextMessage, false, event.shiftKey, true);
-        else if (!event.shiftKey) {
+            event.preventDefault();
+        } else if (!event.shiftKey) {
             this._clearMessagesSelection();
-            this._updateMessagesSelection(messages.lastValue, false, false, true);
-        }
-
-        event.preventDefault();
+            if (messages.length) {
+                this._updateMessagesSelection(messages.lastValue, false, false, true);
+                event.preventDefault();
+            }
+        }
     }