diff options
| author | Phil Crosby | 2012-04-25 22:39:10 -0700 |
|---|---|---|
| committer | Phil Crosby | 2012-04-25 22:39:10 -0700 |
| commit | a26a2bfdcf5c0fd21fb501ed2ace3c2aa6476d8e (patch) | |
| tree | 38da417bbbcd2e0e1b5f2930fa76309f3de134e5 /commands.js | |
| parent | 6b56ff3390a25fc2d5673aacd4ffd4ba44b9a39c (diff) | |
| parent | cbe44163f741b3b20ad06464f9dda80ed271bd15 (diff) | |
| download | vimium-a26a2bfdcf5c0fd21fb501ed2ace3c2aa6476d8e.tar.bz2 | |
Merge pull request #459 from niklasb/fuzzy
Vimium Omnibox implementation, with fuzzy completion
Diffstat (limited to 'commands.js')
| -rw-r--r-- | commands.js | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/commands.js b/commands.js index c961a901..727bf3c7 100644 --- a/commands.js +++ b/commands.js @@ -144,7 +144,12 @@ function clearKeyMappingsAndSetDefaults() { "b": "activateBookmarkFindMode", "B": "activateBookmarkFindModeToOpenInNewTab", - "gf": "nextFrame" + "o": "fuzzyMode.activateAll", + "O": "fuzzyMode.activateAllNewTab", + + "T": "fuzzyMode.activateTabs", + + "gf": "nextFrame", }; for (var key in defaultKeyMappings) @@ -211,6 +216,10 @@ var commandDescriptions = { activateBookmarkFindMode: ["Open a bookmark in the current tab"], activateBookmarkFindModeToOpenInNewTab: ["Open a bookmark in a new tab"], + 'fuzzyMode.activateAll': ["Open URL, bookmark, history entry or a custom search (fuzzy)"], + 'fuzzyMode.activateAllNewTab': ["Open URL, bookmark, history entry or a custom search (fuzzy, new tab)"], + 'fuzzyMode.activateTabs': ["Go to a tab in this window (fuzzy)"], + nextFrame: ["Cycle forward to the next frame on the page", { background: true, passCountToFunction: true }] }; @@ -230,6 +239,7 @@ var commandGroups = { "enterInsertMode", "focusInput", "linkHints.activateMode", "linkHints.activateModeToOpenInNewTab", "linkHints.activateModeWithQueue", "activateBookmarkFindMode", "activateBookmarkFindModeToOpenInNewTab", + "fuzzyMode.activateAll", "fuzzyMode.activateAllNewTab", "fuzzyMode.activateTabs", "goPrevious", "goNext", "nextFrame"], findCommands: ["enterFindMode", "performFind", "performBackwardsFind"], historyNavigation: |