diff options
| author | Phil Crosby | 2014-04-30 00:56:03 -0700 |
|---|---|---|
| committer | Phil Crosby | 2014-04-30 00:56:03 -0700 |
| commit | 4cfb7dd9e38c4d4e3c269952402b4d8161007e6f (patch) | |
| tree | 23148fcf08f482d9f81d28d5a6d9c7600c1260e6 /background_scripts/commands.coffee | |
| parent | c79b35114270ada790a564e1794d042dadf07356 (diff) | |
| parent | 63f0b24d35176e6f72429e6c4ed15b9282c6e21b (diff) | |
| download | vimium-4cfb7dd9e38c4d4e3c269952402b4d8161007e6f.tar.bz2 | |
Merge remote-tracking branch 'mrmr1993/openLinkInFGTab'
Conflicts:
content_scripts/link_hints.coffee
Diffstat (limited to 'background_scripts/commands.coffee')
| -rw-r--r-- | background_scripts/commands.coffee | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/background_scripts/commands.coffee b/background_scripts/commands.coffee index ff98490c..807b8ec0 100644 --- a/background_scripts/commands.coffee +++ b/background_scripts/commands.coffee @@ -86,16 +86,15 @@ Commands = # be shown in the help page. commandGroups: pageNavigation: - ["scrollDown", "scrollUp", "scrollLeft", "scrollRight", - "scrollToTop", "scrollToBottom", "scrollToLeft", "scrollToRight", "scrollPageDown", - "scrollPageUp", "scrollFullPageUp", "scrollFullPageDown", - "reload", "toggleViewSource", "copyCurrentUrl", "LinkHints.activateModeToCopyLinkUrl", - "openCopiedUrlInCurrentTab", "openCopiedUrlInNewTab", "goUp", "goToRoot", - "enterInsertMode", "focusInput", - "LinkHints.activateMode", "LinkHints.activateModeToOpenInNewTab", "LinkHints.activateModeWithQueue", - "Vomnibar.activate", "Vomnibar.activateInNewTab", "Vomnibar.activateTabSelection", - "Vomnibar.activateBookmarks", "Vomnibar.activateBookmarksInNewTab", - "goPrevious", "goNext", "nextFrame", "Marks.activateCreateMode", "Marks.activateGotoMode"] + ["scrollDown", "scrollUp", "scrollLeft", "scrollRight", "scrollToTop", "scrollToBottom", "scrollToLeft", + "scrollToRight", "scrollPageDown", "scrollPageUp", "scrollFullPageUp", "scrollFullPageDown", "reload", + "toggleViewSource", "copyCurrentUrl", "LinkHints.activateModeToCopyLinkUrl", + "openCopiedUrlInCurrentTab", "openCopiedUrlInNewTab", "goUp", "goToRoot", "enterInsertMode", + "focusInput", "LinkHints.activateMode", "LinkHints.activateModeToOpenInNewTab", + "LinkHints.activateModeToOpenInNewForegroundTab", "LinkHints.activateModeWithQueue", "Vomnibar.activate", + "Vomnibar.activateInNewTab", "Vomnibar.activateTabSelection", "Vomnibar.activateBookmarks", + "Vomnibar.activateBookmarksInNewTab", "goPrevious", "goNext", "nextFrame", "Marks.activateCreateMode", + "Marks.activateGotoMode"] findCommands: ["enterFindMode", "performFind", "performBackwardsFind"] historyNavigation: ["goBack", "goForward"] @@ -144,6 +143,7 @@ defaultKeyMappings = "f": "LinkHints.activateMode" "F": "LinkHints.activateModeToOpenInNewTab" "<a-f>": "LinkHints.activateModeWithQueue" + "<c-F>": "LinkHints.activateModeToOpenInNewForegroundTab" "/": "enterFindMode" "n": "performFind" @@ -217,9 +217,10 @@ commandDescriptions = focusInput: ["Focus the first (or n-th) text box on the page", { passCountToFunction: true }] - 'LinkHints.activateMode': ["Open a link in the current tab"] - 'LinkHints.activateModeToOpenInNewTab': ["Open a link in a new tab"] - 'LinkHints.activateModeWithQueue': ["Open multiple links in a new tab"] + "LinkHints.activateMode": ["Open a link in the current tab"] + "LinkHints.activateModeToOpenInNewTab": ["Open a link in a new tab"] + "LinkHints.activateModeToOpenInNewForegroundTab": ["Open a link in a new tab, switch to it"] + "LinkHints.activateModeWithQueue": ["Open multiple links in a new tab"] "LinkHints.activateModeToOpenIncognito": ["Open a link in incognito window"] |