[prev in list] [next in list] [prev in thread] [next in thread] 

List:       webkit-changes
Subject:    [webkit-changes] [74264]
From:       pfeldman () chromium ! org
Date:       2010-12-17 14:58:46
Message-ID: 20101217145846.4BDED600CD07 () beta ! macosforge ! org
[Download RAW message or body]

[Attachment #2 (text/html)]

<!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>[74264] branches/chromium/597/WebCore/inspector/front-end</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/74264">74264</a></dd> \
<dt>Author</dt> <dd>pfeldman@chromium.org</dd> <dt>Date</dt> <dd>2010-12-17 06:58:41 \
-0800 (Fri, 17 Dec 2010)</dd> </dl>

<h3>Log Message</h3>
<pre>Merge 74253 - 2010-12-17  Pavel Feldman  &lt;pfeldman@chromium.org&gt;

        Reviewed by Yury Semikhatsky.

        Web Inspector: [REGRESSION] Cmd (Ctrl) + G does not search next in Scripts \
panel.  https://bugs.webkit.org/show_bug.cgi?id=50893

        Now Mac shortcuts are:
        - Cmd F/G = find / next
        - Cmd L = go to line

        Win/Linux:
        - Ctrl+G = go to line

        * inspector/front-end/ScriptsPanel.js:
        (WebInspector.ScriptsPanel.prototype._registerShortcuts):
        * inspector/front-end/inspector.js:
        (WebInspector._registerShortcuts):


TBR=pfeldman@chromium.org
BUG=67282

Review URL: http://codereview.chromium.org/6006001</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#brancheschromium597WebCoreinspectorfrontendScriptsPaneljs">branches/chromium/597/WebCore/inspector/front-end/ScriptsPanel.js</a></li>
 <li><a href="#brancheschromium597WebCoreinspectorfrontendinspectorjs">branches/chromium/597/WebCore/inspector/front-end/inspector.js</a></li>
 </ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="brancheschromium597WebCoreinspectorfrontendScriptsPaneljs"></a>
<div class="modfile"><h4>Modified: \
branches/chromium/597/WebCore/inspector/front-end/ScriptsPanel.js (74263 => \
74264)</h4> <pre class="diff"><span>
<span class="info">--- \
branches/chromium/597/WebCore/inspector/front-end/ScriptsPanel.js	2010-12-17 14:55:18 \
                UTC (rev 74263)
+++ branches/chromium/597/WebCore/inspector/front-end/ScriptsPanel.js	2010-12-17 \
14:58:41 UTC (rev 74264) </span><span class="lines">@@ -1009,7 +1009,11 @@
</span><span class="cx">         this._shortcuts[shortcut2.key] = handler;
</span><span class="cx">         section.addAlternateKeys([ shortcut1.name, \
shortcut2.name ], WebInspector.UIString(&quot;Step out&quot;)); </span><span \
class="cx">  </span><del>-        shortcut1 = \
WebInspector.KeyboardShortcut.makeDescriptor(&quot;g&quot;, \
platformSpecificModifier); </del><ins>+        var isMac = WebInspector.isMac();
+        if (isMac)
+            shortcut1 = WebInspector.KeyboardShortcut.makeDescriptor(&quot;l&quot;, \
WebInspector.KeyboardShortcut.Modifiers.Meta); +        else
+            shortcut1 = WebInspector.KeyboardShortcut.makeDescriptor(&quot;g&quot;, \
WebInspector.KeyboardShortcut.Modifiers.Ctrl); </ins><span class="cx">         \
this._shortcuts[shortcut1.key] = this.showGoToLineDialog.bind(this); </span><span \
class="cx">         section.addAlternateKeys([ shortcut1.name ], \
WebInspector.UIString(&quot;Go to Line&quot;)); </span><span class="cx">         \
this.sidebarPanes.callstack.registerShortcuts(section); </span></span></pre></div>
<a id="brancheschromium597WebCoreinspectorfrontendinspectorjs"></a>
<div class="modfile"><h4>Modified: \
branches/chromium/597/WebCore/inspector/front-end/inspector.js (74263 => 74264)</h4> \
<pre class="diff"><span> <span class="info">--- \
branches/chromium/597/WebCore/inspector/front-end/inspector.js	2010-12-17 14:55:18 \
                UTC (rev 74263)
+++ branches/chromium/597/WebCore/inspector/front-end/inspector.js	2010-12-17 \
14:58:41 UTC (rev 74264) </span><span class="lines">@@ -825,11 +825,13 @@
</span><span class="cx">     section.addRelatedKeys(keys, \
WebInspector.UIString(&quot;Next/previous panel&quot;)); </span><span class="cx">     \
section.addKey(shortcut.shortcutToString(shortcut.Keys.Esc), \
WebInspector.UIString(&quot;Toggle console&quot;)); </span><span class="cx">     \
section.addKey(shortcut.shortcutToString(&quot;f&quot;, \
shortcut.Modifiers.CtrlOrMeta), WebInspector.UIString(&quot;Search&quot;)); \
                </span><del>-    keys = [
-        shortcut.shortcutToString(&quot;g&quot;, shortcut.Modifiers.CtrlOrMeta),
-        shortcut.shortcutToString(&quot;g&quot;, shortcut.Modifiers.CtrlOrMeta | \
                shortcut.Modifiers.Shift)
-    ];
-    section.addRelatedKeys(keys, WebInspector.UIString(&quot;Find \
next/previous&quot;)); </del><ins>+    if (WebInspector.isMac()) {
+        keys = [
+            shortcut.shortcutToString(&quot;g&quot;, shortcut.Modifiers.Meta),
+            shortcut.shortcutToString(&quot;g&quot;, shortcut.Modifiers.Meta | \
shortcut.Modifiers.Shift) +        ];
+        section.addRelatedKeys(keys, WebInspector.UIString(&quot;Find \
next/previous&quot;)); +    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> WebInspector.documentKeyDown = function(event)
</span><span class="lines">@@ -911,12 +913,7 @@
</span><span class="cx">             break;
</span><span class="cx"> 
</span><span class="cx">         case &quot;U+0047&quot;: // G key
</span><del>-            if (isMac)
-                var isFindAgainKey = event.metaKey &amp;&amp; !event.ctrlKey \
                &amp;&amp; !event.altKey;
-            else
-                var isFindAgainKey = event.ctrlKey &amp;&amp; !event.metaKey \
                &amp;&amp; !event.altKey;
-
-            if (isFindAgainKey) {
</del><ins>+            if (isMac &amp;&amp; event.metaKey &amp;&amp; !event.ctrlKey \
&amp;&amp; !event.altKey) { </ins><span class="cx">                 if \
(event.shiftKey) { </span><span class="cx">                     if \
(this.currentPanel.jumpToPreviousSearchResult) </span><span class="cx">               \
this.currentPanel.jumpToPreviousSearchResult(); </span><span class="lines">@@ -924,7 \
+921,6 @@ </span><span class="cx">                     \
this.currentPanel.jumpToNextSearchResult(); </span><span class="cx">                 \
event.preventDefault(); </span><span class="cx">             }
</span><del>-
</del><span class="cx">             break;
</span><span class="cx"> 
</span><span class="cx">         // Windows and Mac have two different definitions of \
[, so accept both. </span></span></pre>
</div>
</div>

</body>
</html>



_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes


[prev in list] [next in list] [prev in thread] [next in thread]

Configure | About | News | Add a list | Sponsored by KoreLogic