diff options
Diffstat (limited to 'background_scripts/commands.coffee')
| -rw-r--r-- | background_scripts/commands.coffee | 64 |
1 files changed, 29 insertions, 35 deletions
diff --git a/background_scripts/commands.coffee b/background_scripts/commands.coffee index 6c452242..2d901b15 100644 --- a/background_scripts/commands.coffee +++ b/background_scripts/commands.coffee @@ -1,7 +1,7 @@ Commands = init: -> - for own command, description of commandDescriptions - @addCommand(command, description[0], description[1]) + for own command, descriptor of commandDescriptions + @addCommand(command, descriptor[0], descriptor[1]) @loadKeyMappings Settings.get "keyMappings" Settings.postUpdateHooks["keyMappings"] = @loadKeyMappings.bind this @@ -16,14 +16,11 @@ Commands = # Registers a command, making it available to be optionally bound to a key. # options: # - background: whether this command needs to be run against the background page. - # - passCountToFunction: true if this command should have any digits which were typed prior to the - # command passed to it. This is used to implement e.g. "closing of 3 tabs". - addCommand: (command, description, options) -> + addCommand: (command, description, options = {}) -> if command of @availableCommands BgUtils.log "#{command} is already defined! Check commands.coffee for duplicates." return - options ||= {} @availableCommands[command] = extend options, description: description mapKeyToCommand: ({ key, command, options }) -> @@ -134,7 +131,6 @@ Commands = "reload", "toggleViewSource", "copyCurrentUrl", - "LinkHints.activateModeToCopyLinkUrl", "openCopiedUrlInCurrentTab", "openCopiedUrlInNewTab", "goUp", @@ -150,6 +146,7 @@ Commands = "LinkHints.activateModeWithQueue", "LinkHints.activateModeToDownloadLink", "LinkHints.activateModeToOpenIncognito", + "LinkHints.activateModeToCopyLinkUrl", "goPrevious", "goNext", "nextFrame", @@ -241,9 +238,10 @@ defaultKeyMappings = "gi": "focusInput" - "f": "LinkHints.activateMode" - "F": "LinkHints.activateModeToOpenInNewTab" + "f": "LinkHints.activateMode" + "F": "LinkHints.activateModeToOpenInNewTab" "<a-f>": "LinkHints.activateModeWithQueue" + "yf": "LinkHints.activateModeToCopyLinkUrl" "/": "enterFindMode" "n": "performFind" @@ -253,7 +251,6 @@ defaultKeyMappings = "]]": "goNext" "yy": "copyCurrentUrl" - "yf": "LinkHints.activateModeToCopyLinkUrl" "p": "openCopiedUrlInCurrentTab" "P": "openCopiedUrlInNewTab" @@ -299,43 +296,42 @@ defaultKeyMappings = commandDescriptions = # Navigating the current page showHelp: ["Show help", { background: true, noRepeat: true }] - scrollDown: ["Scroll down", { passCountToFunction: true }] - scrollUp: ["Scroll up", { passCountToFunction: true }] - scrollLeft: ["Scroll left", { passCountToFunction: true }] - scrollRight: ["Scroll right", { passCountToFunction: true }] + scrollDown: ["Scroll down"] + scrollUp: ["Scroll up"] + scrollLeft: ["Scroll left"] + scrollRight: ["Scroll right"] - scrollToTop: ["Scroll to the top of the page", { passCountToFunction: true }] + scrollToTop: ["Scroll to the top of the page"] scrollToBottom: ["Scroll to the bottom of the page", { noRepeat: true }] scrollToLeft: ["Scroll all the way to the left", { noRepeat: true }] scrollToRight: ["Scroll all the way to the right", { noRepeat: true }] - scrollPageDown: ["Scroll a page down", { passCountToFunction: true }] - scrollPageUp: ["Scroll a page up", { passCountToFunction: true }] - scrollFullPageDown: ["Scroll a full page down", { passCountToFunction: true }] - scrollFullPageUp: ["Scroll a full page up", { passCountToFunction: true }] + scrollPageDown: ["Scroll a page down"] + scrollPageUp: ["Scroll a page up"] + scrollFullPageDown: ["Scroll a full page down"] + scrollFullPageUp: ["Scroll a full page up"] reload: ["Reload the page", { noRepeat: true }] toggleViewSource: ["View page source", { noRepeat: true }] copyCurrentUrl: ["Copy the current URL to the clipboard", { noRepeat: true }] - "LinkHints.activateModeToCopyLinkUrl": ["Copy a link URL to the clipboard", { passCountToFunction: true }] openCopiedUrlInCurrentTab: ["Open the clipboard's URL in the current tab", { background: true, noRepeat: true }] openCopiedUrlInNewTab: ["Open the clipboard's URL in a new tab", { background: true, repeatLimit: 20 }] enterInsertMode: ["Enter insert mode", { noRepeat: true }] - passNextKey: ["Pass the next key to Chrome", { passCountToFunction: true }] + passNextKey: ["Pass the next key to Chrome"] enterVisualMode: ["Enter visual mode", { noRepeat: true }] enterVisualLineMode: ["Enter visual line mode", { noRepeat: true }] - focusInput: ["Focus the first text box on the page. Cycle between them using tab", - { passCountToFunction: true }] + focusInput: ["Focus the first text box on the page. Cycle between them using tab"] - "LinkHints.activateMode": ["Open a link in the current tab", { passCountToFunction: true }] - "LinkHints.activateModeToOpenInNewTab": ["Open a link in a new tab", { passCountToFunction: true }] - "LinkHints.activateModeToOpenInNewForegroundTab": ["Open a link in a new tab & switch to it", { passCountToFunction: true }] + "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", { noRepeat: true }] - "LinkHints.activateModeToOpenIncognito": ["Open a link in incognito window", { passCountToFunction: true }] - "LinkHints.activateModeToDownloadLink": ["Download link url", { passCountToFunction: true }] + "LinkHints.activateModeToOpenIncognito": ["Open a link in incognito window"] + "LinkHints.activateModeToDownloadLink": ["Download link url"] + "LinkHints.activateModeToCopyLinkUrl": ["Copy a link URL to the clipboard"] enterFindMode: ["Enter find mode", { noRepeat: true }] performFind: ["Cycle forward to the next find match"] @@ -345,12 +341,12 @@ commandDescriptions = goNext: ["Follow the link labeled next or >", { noRepeat: true }] # Navigating your history - goBack: ["Go back in history", { passCountToFunction: true }] - goForward: ["Go forward in history", { passCountToFunction: true }] + goBack: ["Go back in history"] + goForward: ["Go forward in history"] # Navigating the URL hierarchy - goUp: ["Go up the URL hierarchy", { passCountToFunction: true }] - goToRoot: ["Go to root of current URL hierarchy", { passCountToFunction: true }] + goUp: ["Go up the URL hierarchy"] + goToRoot: ["Go to root of current URL hierarchy"] # Manipulating tabs nextTab: ["Go one tab right", { background: true }] @@ -361,9 +357,7 @@ commandDescriptions = createTab: ["Create new tab", { background: true, repeatLimit: 20 }] duplicateTab: ["Duplicate current tab", { background: true, repeatLimit: 20 }] - removeTab: ["Close current tab", { background: true, repeatLimit: - # Require confirmation to remove more tabs than we can restore. - (if chrome.session then chrome.session.MAX_SESSION_RESULTS else 25) }] + removeTab: ["Close current tab", { background: true, repeatLimit: chrome.session?.MAX_SESSION_RESULTS ? 25 }] restoreTab: ["Restore closed tab", { background: true, repeatLimit: 20 }] moveTabToNewWindow: ["Move tab to new window", { background: true }] |