<!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>[185104] trunk/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/185104">185104</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-01 22:46:23 -0700 (Mon, 01 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Better handle keyboard events in the quick console prompt
https://bugs.webkit.org/show_bug.cgi?id=145548
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-06-01
Reviewed by Timothy Hatcher.
* UserInterface/Base/Main.js:
(WebInspector.saveDataToFile):
Move generic InspectorFrontendHost code here.
* UserInterface/Views/ContentBrowser.js:
(WebInspector.ContentBrowser.prototype._save):
(WebInspector.ContentBrowser.prototype._saveAs):
(WebInspector.ContentBrowser.prototype._saveDataToFile): Deleted.
Use the generic save code.
* UserInterface/Controllers/JavaScriptLogViewController.js:
(WebInspector.JavaScriptLogViewController):
(WebInspector.JavaScriptLogViewController.prototype._save):
(WebInspector.JavaScriptLogViewController.prototype._saveAs):
Handle save keyboard shortcuts while the prompt is focused.
* UserInterface/Views/LogContentView.js:
(WebInspector.LogContentView.prototype.focusSearchBar):
(WebInspector.LogContentView.prototype.save):
(WebInspector.LogContentView.prototype.saveAs):
Better handle keyboard shortcut cases in the console prompt for cases
like a collapsed or split console view.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseMainjs">trunk/Source/WebInspectorUI/UserInterface/Base/Main.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersJavaScriptLogViewControllerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptLogViewController.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsContentBrowserjs">trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLogContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (185103 => 185104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-06-02 05:39:11 UTC (rev 185103)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-06-02 05:46:23 UTC (rev 185104)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2015-06-01 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Better handle keyboard events in the quick console prompt
+ https://bugs.webkit.org/show_bug.cgi?id=145548
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Base/Main.js:
+ (WebInspector.saveDataToFile):
+ Move generic InspectorFrontendHost code here.
+
+ * UserInterface/Views/ContentBrowser.js:
+ (WebInspector.ContentBrowser.prototype._save):
+ (WebInspector.ContentBrowser.prototype._saveAs):
+ (WebInspector.ContentBrowser.prototype._saveDataToFile): Deleted.
+ Use the generic save code.
+
+ * UserInterface/Controllers/JavaScriptLogViewController.js:
+ (WebInspector.JavaScriptLogViewController):
+ (WebInspector.JavaScriptLogViewController.prototype._save):
+ (WebInspector.JavaScriptLogViewController.prototype._saveAs):
+ Handle save keyboard shortcuts while the prompt is focused.
+
+ * UserInterface/Views/LogContentView.js:
+ (WebInspector.LogContentView.prototype.focusSearchBar):
+ (WebInspector.LogContentView.prototype.save):
+ (WebInspector.LogContentView.prototype.saveAs):
+ Better handle keyboard shortcut cases in the console prompt for cases
+ like a collapsed or split console view.
+
</ins><span class="cx"> 2015-06-01 Nikita Vasilyev <nvasilyev@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Pause/resume button in the debugger dashboard is vertically misaligned
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (185103 => 185104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-06-02 05:39:11 UTC (rev 185103)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-06-02 05:46:23 UTC (rev 185104)
</span><span class="lines">@@ -655,6 +655,25 @@
</span><span class="cx"> InspectorFrontendHost.closeWindow();
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WebInspector.saveDataToFile = function(saveData, forceSaveAs)
+{
+ console.assert(saveData);
+ if (!saveData)
+ return;
+
+ if (typeof saveData.customSaveHandler === "function") {
+ saveData.customSaveHandler(forceSaveAs);
+ return;
+ }
+
+ console.assert(saveData.url);
+ console.assert(typeof saveData.content === "string");
+ if (!saveData.url || typeof saveData.content !== "string")
+ return;
+
+ InspectorFrontendHost.save(saveData.url, saveData.content, false, forceSaveAs || saveData.forceSaveAs);
+};
+
</ins><span class="cx"> WebInspector.isConsoleFocused = function()
</span><span class="cx"> {
</span><span class="cx"> return this.quickConsole.prompt.focused;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersJavaScriptLogViewControllerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptLogViewController.js (185103 => 185104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptLogViewController.js 2015-06-02 05:39:11 UTC (rev 185103)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/JavaScriptLogViewController.js 2015-06-02 05:46:23 UTC (rev 185104)
</span><span class="lines">@@ -60,6 +60,8 @@
</span><span class="cx"> this._promptFindKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "F", this._handleFindShortcut.bind(this), this._prompt.element);
</span><span class="cx"> this._promptFindNextKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "G", this._handleFindNextShortcut.bind(this), this._prompt.element);
</span><span class="cx"> this._promptFindPreviousKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Shift, "G", this._handleFindPreviousShortcut.bind(this), this._prompt.element);
</span><ins>+ this._promptSaveKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "S", this._save.bind(this), this._prompt.element);
+ this._promptSaveAsKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Shift | WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "S", this._saveAs.bind(this), this._prompt.element);
</ins><span class="cx">
</span><span class="cx"> this.startNewSession();
</span><span class="cx"> }
</span><span class="lines">@@ -260,6 +262,16 @@
</span><span class="cx"> this.delegate.highlightPreviousSearchMatch();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _save()
+ {
+ this.delegate.save();
+ }
+
+ _saveAs()
+ {
+ this.delegate.saveAs();
+ }
+
</ins><span class="cx"> _appendConsoleMessageView(messageView, repeatCountWasInterrupted)
</span><span class="cx"> {
</span><span class="cx"> var wasScrolledToBottom = this.isScrolledToBottom();
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsContentBrowserjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js (185103 => 185104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js 2015-06-02 05:39:11 UTC (rev 185103)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js 2015-06-02 05:46:23 UTC (rev 185104)
</span><span class="lines">@@ -317,32 +317,13 @@
</span><span class="cx"> this.goForward();
</span><span class="cx"> },
</span><span class="cx">
</span><del>- _saveDataToFile: function(saveData, forceSaveAs)
- {
- console.assert(saveData);
- if (!saveData)
- return;
-
- if (typeof saveData.customSaveHandler === "function") {
- saveData.customSaveHandler(forceSaveAs);
- return;
- }
-
- console.assert(saveData.url);
- console.assert(typeof saveData.content === "string");
- if (!saveData.url || typeof saveData.content !== "string")
- return;
-
- InspectorFrontendHost.save(saveData.url, saveData.content, false, forceSaveAs || saveData.forceSaveAs);
- },
-
</del><span class="cx"> _save: function(event)
</span><span class="cx"> {
</span><span class="cx"> var currentContentView = this.currentContentView;
</span><span class="cx"> if (!currentContentView || !currentContentView.supportsSave)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- this._saveDataToFile(currentContentView.saveData);
</del><ins>+ WebInspector.saveDataToFile(currentContentView.saveData);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _saveAs: function(event)
</span><span class="lines">@@ -351,7 +332,7 @@
</span><span class="cx"> if (!currentContentView || !currentContentView.supportsSave)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- this._saveDataToFile(currentContentView.saveData, true);
</del><ins>+ WebInspector.saveDataToFile(currentContentView.saveData, true);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _showFindBanner: function(event)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLogContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js (185103 => 185104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2015-06-02 05:39:11 UTC (rev 185103)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LogContentView.js 2015-06-02 05:46:23 UTC (rev 185104)
</span><span class="lines">@@ -229,9 +229,34 @@
</span><span class="cx">
</span><span class="cx"> focusSearchBar: function()
</span><span class="cx"> {
</span><ins>+ if (!this.visible)
+ return;
+
</ins><span class="cx"> this._searchBar.focus();
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ save: function()
+ {
+ if (!this.visible)
+ return;
+
+ if (WebInspector.isShowingSplitConsole())
+ return;
+
+ WebInspector.saveDataToFile(this.saveData);
+ },
+
+ saveAs: function()
+ {
+ if (!this.visible)
+ return;
+
+ if (WebInspector.isShowingSplitConsole())
+ return;
+
+ WebInspector.saveDataToFile(this.saveData, true);
+ },
+
</ins><span class="cx"> highlightPreviousSearchMatch: function()
</span><span class="cx"> {
</span><span class="cx"> if (!this.searchInProgress || isEmptyObject(this._searchMatches))
</span></span></pre>
</div>
</div>
</body>
</html>