Changeset 99416 in webkit

Timestamp:

Nov 7, 2011, 6:20:23 AM (14 years ago)

Author:

vsevik@chromium.org

Message:

Web Inspector: Add advanced search shortcut to ShortcutsScreen.
​https://bugs.webkit.org/show_bug.cgi?id=71302

Reviewed by Pavel Feldman.

• English.lproj/localizedStrings.js:
• inspector/front-end/AdvancedSearchController.js:

(WebInspector.AdvancedSearchController.createShortcut):

• inspector/front-end/inspector.js:

(WebInspector._registerShortcuts):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• English.lproj/localizedStrings.js (modified) ( previous)
• inspector/front-end/AdvancedSearchController.js (modified) (1 diff)
• inspector/front-end/inspector.js (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-07  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: Add advanced search shortcut to ShortcutsScreen.
+        https://bugs.webkit.org/show_bug.cgi?id=71302
+
+        Reviewed by Pavel Feldman.
+
+        * English.lproj/localizedStrings.js:
+        * inspector/front-end/AdvancedSearchController.js:
+        (WebInspector.AdvancedSearchController.createShortcut):
+        * inspector/front-end/inspector.js:
+        (WebInspector._registerShortcuts):
+
 2011-11-07  Andreas Kling  <kling@webkit.org>
 

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

@@ -42 +42 @@
 WebInspector.AdvancedSearchController.createShortcut = function()
 {
-    return WebInspector.KeyboardShortcut.makeDescriptor("f", WebInspector.KeyboardShortcut.Modifiers.CtrlOrMeta | WebInspector.KeyboardShortcut.Modifiers.Shift);
+    if (WebInspector.isMac())
+        return WebInspector.KeyboardShortcut.makeDescriptor("f", WebInspector.KeyboardShortcut.Modifiers.Meta | WebInspector.KeyboardShortcut.Modifiers.Alt);
+    else
+        return WebInspector.KeyboardShortcut.makeDescriptor("f", WebInspector.KeyboardShortcut.Modifiers.Ctrl | WebInspector.KeyboardShortcut.Modifiers.Shift);
 }
 

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

@@ -554 +554 @@
     section.addKey(shortcut.shortcutToString(shortcut.Keys.Esc), WebInspector.UIString("Toggle console"));
     section.addKey(shortcut.shortcutToString("f", shortcut.Modifiers.CtrlOrMeta), WebInspector.UIString("Search"));
+    
+    var advancedSearchShortcut = WebInspector.AdvancedSearchController.createShortcut();
+    section.addKey(advancedSearchShortcut.name, WebInspector.UIString("Search across all scripts"));
+    
     if (WebInspector.isMac()) {
         keys = [