<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[193122] branches/safari-601-branch/Source/WebInspectorUI</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/193122">193122</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 10:48:53 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188581">r188581</a>. rdar://problem/23221163</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceControllersJavaScriptLogViewControllerjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptLogViewController.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsConsolePromptjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ConsolePrompt.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193121 => 193122)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:48:47 UTC (rev 193121)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:48:53 UTC (rev 193122)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188581. rdar://problem/23221163
+
+ 2015-08-18 Nikita Vasilyev <nvasilyev@apple.com>
+
+ Web Inspector: Option-Enter should commit console command without erasing the prompt
+ https://bugs.webkit.org/show_bug.cgi?id=148123
+
+ Also, don't append a console command if it's the same as the last one.
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Controllers/JavaScriptLogViewController.js:
+ (WebInspector.JavaScriptLogViewController):
+ * UserInterface/Views/ConsolePrompt.js:
+ (WebInspector.ConsolePrompt):
+ (WebInspector.ConsolePrompt.prototype._handleEnterKey.commitTextOrInsertNewLine):
+ (WebInspector.ConsolePrompt.prototype._handleEnterKey):
+ (WebInspector.ConsolePrompt.prototype._handleOptionEnterKey):
+ (WebInspector.ConsolePrompt.prototype._handleCommandOptionEnterKey):
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r188578. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-08-17 Nikita Vasilyev <nvasilyev@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceControllersJavaScriptLogViewControllerjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptLogViewController.js (193121 => 193122)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptLogViewController.js 2015-12-03 18:48:47 UTC (rev 193121)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptLogViewController.js 2015-12-03 18:48:53 UTC (rev 193122)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx">
</span><span class="cx"> this._cleared = true;
</span><span class="cx"> this._previousMessageView = null;
</span><ins>+ this._lastCommited = "";
</ins><span class="cx"> this._repeatCountWasInterrupted = false;
</span><span class="cx">
</span><span class="cx"> this._sessions = [];
</span><span class="lines">@@ -221,8 +222,11 @@
</span><span class="cx"> {
</span><span class="cx"> console.assert(text);
</span><span class="cx">
</span><del>- var commandMessageView = new WebInspector.ConsoleCommandView(text);
- this._appendConsoleMessageView(commandMessageView, true);
</del><ins>+ if (this._lastCommited !== text) {
+ var commandMessageView = new WebInspector.ConsoleCommandView(text);
+ this._appendConsoleMessageView(commandMessageView, true);
+ this._lastCommited = text;
+ }
</ins><span class="cx">
</span><span class="cx"> function printResult(result, wasThrown, savedResultIndex)
</span><span class="cx"> {
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsConsolePromptjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ConsolePrompt.js (193121 => 193122)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ConsolePrompt.js 2015-12-03 18:48:47 UTC (rev 193121)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ConsolePrompt.js 2015-12-03 18:48:53 UTC (rev 193122)
</span><span class="lines">@@ -51,6 +51,8 @@
</span><span class="cx"> "Ctrl-N": this._handleNextKey.bind(this),
</span><span class="cx"> "Enter": this._handleEnterKey.bind(this),
</span><span class="cx"> "Cmd-Enter": this._handleCommandEnterKey.bind(this),
</span><ins>+ "Alt-Enter": this._handleOptionEnterKey.bind(this),
+ "Cmd-Alt-Enter": this._handleCommandOptionEnterKey.bind(this),
</ins><span class="cx"> "Tab": this._handleTabKey.bind(this),
</span><span class="cx"> "Esc": this._handleEscapeKey.bind(this)
</span><span class="cx"> };
</span><span class="lines">@@ -230,7 +232,7 @@
</span><span class="cx"> this._restoreHistoryEntry(this._historyIndex);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _handleEnterKey(codeMirror, forceCommit)
</del><ins>+ _handleEnterKey(codeMirror, forceCommit, keepCurrentText)
</ins><span class="cx"> {
</span><span class="cx"> var currentText = this.text;
</span><span class="cx">
</span><span class="lines">@@ -261,8 +263,10 @@
</span><span class="cx">
</span><span class="cx"> this._commitHistoryEntry(this._historyEntryForCurrentText());
</span><span class="cx">
</span><del>- this._codeMirror.setValue("");
- this._codeMirror.clearHistory();
</del><ins>+ if (!keepCurrentText) {
+ this._codeMirror.setValue("");
+ this._codeMirror.clearHistory();
+ }
</ins><span class="cx">
</span><span class="cx"> if (this.delegate && typeof this.delegate.consolePromptHistoryDidChange === "function")
</span><span class="cx"> this.delegate.consolePromptHistoryDidChange(this);
</span><span class="lines">@@ -303,6 +307,16 @@
</span><span class="cx"> this._handleEnterKey(codeMirror, true);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _handleOptionEnterKey(codeMirror)
+ {
+ this._handleEnterKey(codeMirror, false, true);
+ }
+
+ _handleCommandOptionEnterKey(codeMirror)
+ {
+ this._handleEnterKey(codeMirror, true, true);
+ }
+
</ins><span class="cx"> _restoreHistoryEntry(index)
</span><span class="cx"> {
</span><span class="cx"> var historyEntry = this._history[index];
</span></span></pre>
</div>
</div>
</body>
</html>