<!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>[163305] releases/WebKitGTK/webkit-2.4/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/163305">163305</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-03 06:34:28 -0800 (Mon, 03 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/163086">r163086</a> - Web Inspector: Implement open/close Console window shortcut
https://bugs.webkit.org/show_bug.cgi?id=127896
Patch by Diego Pino Garcia <dpino@igalia.com> on 2014-01-30
Reviewed by Timothy Hatcher.
* UserInterface/KeyboardShortcut.js:
(WebInspector.KeyboardShortcut.prototype.get displayName):
Bug: Option symbol should be displayed as Alternative symbol (\u2387)
in non Mac platforms.
* UserInterface/Main.js:
(WebInspector.contentLoaded):
Create keyboard shortcut for toggling console window.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24SourceWebInspectorUIChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebInspectorUIUserInterfaceKeyboardShortcutjs">releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/UserInterface/KeyboardShortcut.js</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebInspectorUIUserInterfaceMainjs">releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/UserInterface/Main.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24SourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/ChangeLog (163304 => 163305)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/ChangeLog 2014-02-03 14:32:18 UTC (rev 163304)
+++ releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/ChangeLog 2014-02-03 14:34:28 UTC (rev 163305)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-01-30 Diego Pino Garcia <dpino@igalia.com>
+
+ Web Inspector: Implement open/close Console window shortcut
+ https://bugs.webkit.org/show_bug.cgi?id=127896
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/KeyboardShortcut.js:
+ (WebInspector.KeyboardShortcut.prototype.get displayName):
+ Bug: Option symbol should be displayed as Alternative symbol (\u2387)
+ in non Mac platforms.
+ * UserInterface/Main.js:
+ (WebInspector.contentLoaded):
+ Create keyboard shortcut for toggling console window.
+
</ins><span class="cx"> 2014-01-29 Diego Pino Garcia <dpino@igalia.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: [REGRESSION(r162931)] Tab navigation broken in DataGrid
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebInspectorUIUserInterfaceKeyboardShortcutjs"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/UserInterface/KeyboardShortcut.js (163304 => 163305)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/UserInterface/KeyboardShortcut.js 2014-02-03 14:32:18 UTC (rev 163304)
+++ releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/UserInterface/KeyboardShortcut.js 2014-02-03 14:34:28 UTC (rev 163305)
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> if (this._modifiers & WebInspector.KeyboardShortcut.Modifier.Control)
</span><span class="cx"> result += "\u2303";
</span><span class="cx"> if (this._modifiers & WebInspector.KeyboardShortcut.Modifier.Option)
</span><del>- result += "\u2325";
</del><ins>+ result += InspectorFrontendHost.platform() === "mac" ? "\u2325" : "\u2387";
</ins><span class="cx"> if (this._modifiers & WebInspector.KeyboardShortcut.Modifier.Shift)
</span><span class="cx"> result += "\u21e7";
</span><span class="cx"> if (this._modifiers & WebInspector.KeyboardShortcut.Modifier.Command)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebInspectorUIUserInterfaceMainjs"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/UserInterface/Main.js (163304 => 163305)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/UserInterface/Main.js 2014-02-03 14:32:18 UTC (rev 163304)
+++ releases/WebKitGTK/webkit-2.4/Source/WebInspectorUI/UserInterface/Main.js 2014-02-03 14:34:28 UTC (rev 163305)
</span><span class="lines">@@ -225,6 +225,8 @@
</span><span class="cx"> this._reloadPageKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "R", this._reloadPage.bind(this));
</span><span class="cx"> this._reloadPageIgnoringCacheKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Shift, "R", this._reloadPageIgnoringCache.bind(this));
</span><span class="cx">
</span><ins>+ this._consoleKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.Option | WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "C", this.toggleConsoleView.bind(this));
+
</ins><span class="cx"> this._inspectModeKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Shift, "C", this._toggleInspectMode.bind(this));
</span><span class="cx">
</span><span class="cx"> this._undoKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl, "Z", this._undoKeyboardShortcut.bind(this));
</span><span class="lines">@@ -257,9 +259,8 @@
</span><span class="cx"> this.toolbar.addToolbarItem(this.debuggerSidebarPanel.toolbarItem, WebInspector.Toolbar.Section.Left);
</span><span class="cx">
</span><span class="cx"> // The toolbar button for the console.
</span><del>- const consoleKeyboardShortcut = "\u2325\u2318C"; // Option-Command-C
- var toolTip = WebInspector.UIString("Show console (%s)").format(consoleKeyboardShortcut);
- var activatedToolTip = WebInspector.UIString("Hide console");
</del><ins>+ var toolTip = WebInspector.UIString("Show console (%s)").format(WebInspector._consoleKeyboardShortcut.displayName);
+ var activatedToolTip = WebInspector.UIString("Hide console (%s)").format(WebInspector._consoleKeyboardShortcut.displayName);
</ins><span class="cx"> this._consoleToolbarButton = new WebInspector.ActivateButtonToolbarItem("console", toolTip, activatedToolTip, WebInspector.UIString("Console"), "Images/NavigationItemLog.svg");
</span><span class="cx"> this._consoleToolbarButton.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this.toggleConsoleView, this);
</span><span class="cx"> this.toolbar.addToolbarItem(this._consoleToolbarButton, WebInspector.Toolbar.Section.Center);
</span></span></pre>
</div>
</div>
</body>
</html>