diff options
Diffstat (limited to 'WebCore/inspector/front-end/inspector.js')
| -rw-r--r-- | WebCore/inspector/front-end/inspector.js | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/WebCore/inspector/front-end/inspector.js b/WebCore/inspector/front-end/inspector.js index 78592ff..212f41a 100644 --- a/WebCore/inspector/front-end/inspector.js +++ b/WebCore/inspector/front-end/inspector.js @@ -825,11 +825,13 @@ WebInspector._registerShortcuts = function() section.addRelatedKeys(keys, WebInspector.UIString("Next/previous panel")); 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")); + } } WebInspector.documentKeyDown = function(event) @@ -911,12 +913,7 @@ WebInspector.documentKeyDown = function(event) break; 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) this.currentPanel.jumpToPreviousSearchResult(); @@ -924,7 +921,6 @@ WebInspector.documentKeyDown = function(event) this.currentPanel.jumpToNextSearchResult(); event.preventDefault(); } - break; // Windows and Mac have two different definitions of [, so accept both. |