Changeset 74253 in webkit

Timestamp:

Dec 17, 2010 4:52:18 AM (13 years ago)

Author:

pfeldman@chromium.org

Message:

2010-12-17 Pavel Feldman <​pfeldman@chromium.org>

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):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/ScriptsPanel.js (modified) (1 diff)
• inspector/front-end/inspector.js (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-17  Pavel Feldman  <pfeldman@chromium.org>
+
+        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):
+
 2010-12-16  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/WebCore/inspector/front-end/ScriptsPanel.js

@@ -984 +984 @@
         section.addAlternateKeys([ shortcut1.name, shortcut2.name ], WebInspector.UIString("Step out"));
 
-        shortcut1 = WebInspector.KeyboardShortcut.makeDescriptor("g", platformSpecificModifier);
+        var isMac = WebInspector.isMac();
+        if (isMac)
+            shortcut1 = WebInspector.KeyboardShortcut.makeDescriptor("l", WebInspector.KeyboardShortcut.Modifiers.Meta);
+        else
+            shortcut1 = WebInspector.KeyboardShortcut.makeDescriptor("g", WebInspector.KeyboardShortcut.Modifiers.Ctrl);
         this._shortcuts[shortcut1.key] = this.showGoToLineDialog.bind(this);
         section.addAlternateKeys([ shortcut1.name ], WebInspector.UIString("Go to Line"));

trunk/WebCore/inspector/front-end/inspector.js

@@ -790 +790 @@
     section.addKey(shortcut.shortcutToString(shortcut.Keys.Esc), WebInspector.UIString("Toggle console"));
     section.addKey(shortcut.shortcutToString("f", shortcut.Modifiers.CtrlOrMeta), WebInspector.UIString("Search"));
-    keys = [
-        shortcut.shortcutToString("g", shortcut.Modifiers.CtrlOrMeta),
-        shortcut.shortcutToString("g", shortcut.Modifiers.CtrlOrMeta | shortcut.Modifiers.Shift)
-    ];
-    section.addRelatedKeys(keys, WebInspector.UIString("Find next/previous"));
+    if (WebInspector.isMac()) {
+        keys = [
+            shortcut.shortcutToString("g", shortcut.Modifiers.Meta),
+            shortcut.shortcutToString("g", shortcut.Modifiers.Meta | shortcut.Modifiers.Shift)
+        ];
+        section.addRelatedKeys(keys, WebInspector.UIString("Find next/previous"));
+    }
 }
 
@@ -876 +878 @@
 
         case "U+0047": // G key
-            if (isMac)
-                var isFindAgainKey = event.metaKey && !event.ctrlKey && !event.altKey;
-            else
-                var isFindAgainKey = event.ctrlKey && !event.metaKey && !event.altKey;
-
-            if (isFindAgainKey) {
+            if (isMac && event.metaKey && !event.ctrlKey && !event.altKey) {
                 if (event.shiftKey) {
                     if (this.currentPanel.jumpToPreviousSearchResult)
@@ -889 +886 @@
                 event.preventDefault();
             }
-
             break;