Title: [188862] trunk/Source/WebInspectorUI
- Revision
- 188862
- Author
- [email protected]
- Date
- 2015-08-24 08:57:09 -0700 (Mon, 24 Aug 2015)
Log Message
REGRESSION (r188581): Web Inspector: Console user command isn't visible when it's expected to be
https://bugs.webkit.org/show_bug.cgi?id=148283
One of the improvements of r188581 "Option-Enter should commit console command
without erasing the prompt" was not to show a console user command if it's the
same as the previous one.
However, there could be a lot of other messages between the last two user
commands - console.log, CSS warnings, etc. In that case we should show a console
user command again by resetting _lastCommitted.
Reviewed by Timothy Hatcher.
* UserInterface/Controllers/_javascript_LogViewController.js:
(WebInspector._javascript_LogViewController):
(WebInspector._javascript_LogViewController.prototype.startNewSession):
(WebInspector._javascript_LogViewController.prototype._appendConsoleMessageView):
Reset _lastCommitted for all messages except for user commands and use command results.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (188861 => 188862)
--- trunk/Source/WebInspectorUI/ChangeLog 2015-08-24 15:55:40 UTC (rev 188861)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-08-24 15:57:09 UTC (rev 188862)
@@ -1,3 +1,24 @@
+2015-08-24 Nikita Vasilyev <[email protected]>
+
+ REGRESSION (r188581): Web Inspector: Console user command isn't visible when it's expected to be
+ https://bugs.webkit.org/show_bug.cgi?id=148283
+
+ One of the improvements of r188581 "Option-Enter should commit console command
+ without erasing the prompt" was not to show a console user command if it's the
+ same as the previous one.
+
+ However, there could be a lot of other messages between the last two user
+ commands - console.log, CSS warnings, etc. In that case we should show a console
+ user command again by resetting _lastCommitted.
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Controllers/_javascript_LogViewController.js:
+ (WebInspector._javascript_LogViewController):
+ (WebInspector._javascript_LogViewController.prototype.startNewSession):
+ (WebInspector._javascript_LogViewController.prototype._appendConsoleMessageView):
+ Reset _lastCommitted for all messages except for user commands and use command results.
+
2015-08-24 Matt Baker <[email protected]>
Web Inspector: Rendering Frames filter checkboxes all become checked during recording
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/_javascript_LogViewController.js (188861 => 188862)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/_javascript_LogViewController.js 2015-08-24 15:55:40 UTC (rev 188861)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/_javascript_LogViewController.js 2015-08-24 15:57:09 UTC (rev 188862)
@@ -45,7 +45,7 @@
this._cleared = true;
this._previousMessageView = null;
- this._lastCommited = "";
+ this._lastCommitted = "";
this._repeatCountWasInterrupted = false;
this._sessions = [];
@@ -109,7 +109,7 @@
var consoleSession = new WebInspector.ConsoleSession;
this._previousMessageView = null;
- this._lastCommited = "";
+ this._lastCommitted = "";
this._repeatCountWasInterrupted = false;
this._sessions.push(consoleSession);
@@ -223,10 +223,10 @@
{
console.assert(text);
- if (this._lastCommited !== text) {
+ if (this._lastCommitted !== text) {
let commandMessageView = new WebInspector.ConsoleCommandView(text);
this._appendConsoleMessageView(commandMessageView, true);
- this._lastCommited = text;
+ this._lastCommitted = text;
}
function printResult(result, wasThrown, savedResultIndex)
@@ -284,6 +284,9 @@
if (!repeatCountWasInterrupted)
this._previousMessageView = messageView;
+ if (messageView.message && messageView.message.source !== WebInspector.ConsoleMessage.MessageSource.JS)
+ this._lastCommitted = "";
+
var type = messageView instanceof WebInspector.ConsoleCommandView ? null : messageView.message.type;
if (type === WebInspector.ConsoleMessage.MessageType.EndGroup) {
var parentGroup = this._currentConsoleGroup.parentGroup;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
