<!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>[51341] trunk/WebCore</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/51341">51341</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2009-11-24 09:53:59 -0800 (Tue, 24 Nov 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-11-24  Joseph Pecoraro  &lt;joepeck@webkit.org&gt;

        Reviewed by Pavel Feldman.

        Web Inspector: Keyboard Shortcut to Clear Console Messages
        https://bugs.webkit.org/show_bug.cgi?id=31780

        All Platforms:  Ctrl+L  = Clear Console Messages
        Mac Only:       Cmd+K   = Clear Console Messages

        * inspector/front-end/ConsoleView.js:
        (WebInspector.ConsoleView): create shortcuts
        (WebInspector.ConsoleView.prototype._promptKeyDown): handle shortcuts
        * inspector/front-end/KeyboardShortcut.js:
        (WebInspector.KeyboardShortcut.makeKey): convenience conversion of &quot;a-z&quot; character to keyCode
        * inspector/front-end/ScriptsPanel.js:
        (WebInspector.ScriptsPanel): style fixes for keyboard shortcuts</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreinspectorfrontendConsoleViewjs">trunk/WebCore/inspector/front-end/ConsoleView.js</a></li>
<li><a href="#trunkWebCoreinspectorfrontendKeyboardShortcutjs">trunk/WebCore/inspector/front-end/KeyboardShortcut.js</a></li>
<li><a href="#trunkWebCoreinspectorfrontendScriptsPaneljs">trunk/WebCore/inspector/front-end/ScriptsPanel.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (51340 => 51341)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-11-24 17:20:56 UTC (rev 51340)
+++ trunk/WebCore/ChangeLog        2009-11-24 17:53:59 UTC (rev 51341)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2009-11-24  Joseph Pecoraro  &lt;joepeck@webkit.org&gt;
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: Keyboard Shortcut to Clear Console Messages
+        https://bugs.webkit.org/show_bug.cgi?id=31780
+
+        All Platforms:  Ctrl+L  = Clear Console Messages
+        Mac Only:       Cmd+K   = Clear Console Messages
+
+        * inspector/front-end/ConsoleView.js:
+        (WebInspector.ConsoleView): create shortcuts
+        (WebInspector.ConsoleView.prototype._promptKeyDown): handle shortcuts
+        * inspector/front-end/KeyboardShortcut.js:
+        (WebInspector.KeyboardShortcut.makeKey): convenience conversion of &quot;a-z&quot; character to keyCode
+        * inspector/front-end/ScriptsPanel.js:
+        (WebInspector.ScriptsPanel): style fixes for keyboard shortcuts
+
</ins><span class="cx"> 2009-11-24  Pavel Feldman  &lt;pfeldman@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Not reviewed: touch inspector controller in order to
</span></span></pre></div>
<a id="trunkWebCoreinspectorfrontendConsoleViewjs"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/inspector/front-end/ConsoleView.js (51340 => 51341)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/inspector/front-end/ConsoleView.js        2009-11-24 17:20:56 UTC (rev 51340)
+++ trunk/WebCore/inspector/front-end/ConsoleView.js        2009-11-24 17:53:59 UTC (rev 51341)
</span><span class="lines">@@ -92,6 +92,17 @@
</span><span class="cx">     this.logElement = createFilterElement.call(this, &quot;Logs&quot;);
</span><span class="cx"> 
</span><span class="cx">     this.filter(this.allElement, false);
</span><ins>+
+    this._shortcuts = {};
+
+    var shortcut;
+    var handler = this.clearMessages.bind(this, true);
+
+    shortcut = WebInspector.KeyboardShortcut.makeKey(&quot;k&quot;, WebInspector.KeyboardShortcut.Modifiers.Meta);
+    this._shortcuts[shortcut] = handler;
+    this._shortcuts[shortcut].isMacOnly = true;
+    shortcut = WebInspector.KeyboardShortcut.makeKey(&quot;l&quot;, WebInspector.KeyboardShortcut.Modifiers.Ctrl);
+    this._shortcuts[shortcut] = handler;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> WebInspector.ConsoleView.prototype = {
</span><span class="lines">@@ -392,6 +403,7 @@
</span><span class="cx">             this._enterKeyPressed(event);
</span><span class="cx">             return;
</span><span class="cx">         }
</span><ins>+
</ins><span class="cx">         if (isFnKey(event)) {
</span><span class="cx">             if (WebInspector.currentPanel &amp;&amp; WebInspector.currentPanel.handleKeyEvent) {
</span><span class="cx">                 WebInspector.currentPanel.handleKeyEvent(event);
</span><span class="lines">@@ -399,6 +411,16 @@
</span><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx"> 
</span><ins>+        var shortcut = WebInspector.KeyboardShortcut.makeKeyFromEvent(event);
+        var handler = this._shortcuts[shortcut];
+        if (handler) {
+            if (!this._shortcuts[shortcut].isMacOnly || WebInspector.isMac()) {
+                handler();
+                event.preventDefault();
+                return;
+            }
+        }
+
</ins><span class="cx">         this.prompt.handleKeyEvent(event);
</span><span class="cx">     },
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCoreinspectorfrontendKeyboardShortcutjs"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/inspector/front-end/KeyboardShortcut.js (51340 => 51341)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/inspector/front-end/KeyboardShortcut.js        2009-11-24 17:20:56 UTC (rev 51340)
+++ trunk/WebCore/inspector/front-end/KeyboardShortcut.js        2009-11-24 17:53:59 UTC (rev 51341)
</span><span class="lines">@@ -76,12 +76,14 @@
</span><span class="cx"> 
</span><span class="cx"> /**
</span><span class="cx">  * Creates a number encoding keyCode in the lower 8 bits and modifiers mask in the higher 8 bits.
</span><del>- * It is usefull for matching pressed keys.
- * @param {number} keyCode Code of the key.
- * @param {number} optModifiers Optional list of modifiers passed as additional paramerters.
</del><ins>+ * It is useful for matching pressed keys.
+ * keyCode is the Code of the key, or a character &quot;a-z&quot; which is converted to a keyCode value.
+ * optModifiers is an Optional list of modifiers passed as additional paramerters.
</ins><span class="cx">  */
</span><span class="cx"> WebInspector.KeyboardShortcut.makeKey = function(keyCode, optModifiers)
</span><span class="cx"> {
</span><ins>+    if (typeof keyCode === &quot;string&quot;)
+        keyCode = keyCode.charCodeAt(0) - 32;
</ins><span class="cx">     var modifiers = WebInspector.KeyboardShortcut.Modifiers.None;
</span><span class="cx">     for (var i = 1; i &lt; arguments.length; i++)
</span><span class="cx">         modifiers |= arguments[i];
</span></span></pre></div>
<a id="trunkWebCoreinspectorfrontendScriptsPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/inspector/front-end/ScriptsPanel.js (51340 => 51341)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/inspector/front-end/ScriptsPanel.js        2009-11-24 17:20:56 UTC (rev 51340)
+++ trunk/WebCore/inspector/front-end/ScriptsPanel.js        2009-11-24 17:53:59 UTC (rev 51341)
</span><span class="lines">@@ -161,35 +161,35 @@
</span><span class="cx">     this._breakpointsURLMap = {};
</span><span class="cx"> 
</span><span class="cx">     this._shortcuts = {};
</span><del>-
</del><ins>+    var handler, shortcut;
</ins><span class="cx">     var platformSpecificModifier = WebInspector.isMac() ? WebInspector.KeyboardShortcut.Modifiers.Meta : WebInspector.KeyboardShortcut.Modifiers.Ctrl;
</span><span class="cx"> 
</span><span class="cx">     // Continue.
</span><del>-    var handler = this.pauseButton.click.bind(this.pauseButton);
-    var shortcut = WebInspector.KeyboardShortcut.makeKey(WebInspector.KeyboardShortcut.KeyCodes.F8);
</del><ins>+    handler = this.pauseButton.click.bind(this.pauseButton);
+    shortcut = WebInspector.KeyboardShortcut.makeKey(WebInspector.KeyboardShortcut.KeyCodes.F8);
</ins><span class="cx">     this._shortcuts[shortcut] = handler;
</span><del>-    var shortcut = WebInspector.KeyboardShortcut.makeKey(WebInspector.KeyboardShortcut.KeyCodes.Slash, platformSpecificModifier);
</del><ins>+    shortcut = WebInspector.KeyboardShortcut.makeKey(WebInspector.KeyboardShortcut.KeyCodes.Slash, platformSpecificModifier);
</ins><span class="cx">     this._shortcuts[shortcut] = handler;
</span><span class="cx"> 
</span><span class="cx">     // Step over.
</span><del>-    var handler = this.stepOverButton.click.bind(this.stepOverButton);
-    var shortcut = WebInspector.KeyboardShortcut.makeKey(WebInspector.KeyboardShortcut.KeyCodes.F10);
</del><ins>+    handler = this.stepOverButton.click.bind(this.stepOverButton);
+    shortcut = WebInspector.KeyboardShortcut.makeKey(WebInspector.KeyboardShortcut.KeyCodes.F10);
</ins><span class="cx">     this._shortcuts[shortcut] = handler;
</span><del>-    var shortcut = WebInspector.KeyboardShortcut.makeKey(WebInspector.KeyboardShortcut.KeyCodes.SingleQuote, platformSpecificModifier);
</del><ins>+    shortcut = WebInspector.KeyboardShortcut.makeKey(WebInspector.KeyboardShortcut.KeyCodes.SingleQuote, platformSpecificModifier);
</ins><span class="cx">     this._shortcuts[shortcut] = handler;
</span><span class="cx"> 
</span><span class="cx">     // Step into.
</span><del>-    var handler = this.stepIntoButton.click.bind(this.stepIntoButton);
-    var shortcut = WebInspector.KeyboardShortcut.makeKey(WebInspector.KeyboardShortcut.KeyCodes.F11);
</del><ins>+    handler = this.stepIntoButton.click.bind(this.stepIntoButton);
+    shortcut = WebInspector.KeyboardShortcut.makeKey(WebInspector.KeyboardShortcut.KeyCodes.F11);
</ins><span class="cx">     this._shortcuts[shortcut] = handler;
</span><del>-    var shortcut = WebInspector.KeyboardShortcut.makeKey(WebInspector.KeyboardShortcut.KeyCodes.Semicolon, platformSpecificModifier);
</del><ins>+    shortcut = WebInspector.KeyboardShortcut.makeKey(WebInspector.KeyboardShortcut.KeyCodes.Semicolon, platformSpecificModifier);
</ins><span class="cx">     this._shortcuts[shortcut] = handler;
</span><span class="cx"> 
</span><span class="cx">     // Step out.
</span><del>-    var handler = this.stepOutButton.click.bind(this.stepOutButton);
-    var shortcut = WebInspector.KeyboardShortcut.makeKey(WebInspector.KeyboardShortcut.KeyCodes.F11, WebInspector.KeyboardShortcut.Modifiers.Shift);
</del><ins>+    handler = this.stepOutButton.click.bind(this.stepOutButton);
+    shortcut = WebInspector.KeyboardShortcut.makeKey(WebInspector.KeyboardShortcut.KeyCodes.F11, WebInspector.KeyboardShortcut.Modifiers.Shift);
</ins><span class="cx">     this._shortcuts[shortcut] = handler;
</span><del>-    var shortcut = WebInspector.KeyboardShortcut.makeKey(WebInspector.KeyboardShortcut.KeyCodes.Semicolon, WebInspector.KeyboardShortcut.Modifiers.Shift, platformSpecificModifier);
</del><ins>+    shortcut = WebInspector.KeyboardShortcut.makeKey(WebInspector.KeyboardShortcut.KeyCodes.Semicolon, WebInspector.KeyboardShortcut.Modifiers.Shift, platformSpecificModifier);
</ins><span class="cx">     this._shortcuts[shortcut] = handler;
</span><span class="cx"> 
</span><span class="cx">     this.reset();
</span></span></pre>
</div>
</div>

</body>
</html>