diff options
| author | mrmr1993 | 2017-10-25 01:04:58 +0100 |
|---|---|---|
| committer | mrmr1993 | 2017-10-27 20:36:07 +0100 |
| commit | 6cb8a82b7cf7d6930b669fae74e1751a1e87567d (patch) | |
| tree | 6e6bb3f56920aea7a1d046a4dafe5a9687f8d226 | |
| parent | b06ed7bd5cc82ec3307aeee945bcf6bf8f9264ce (diff) | |
| download | vimium-6cb8a82b7cf7d6930b669fae74e1751a1e87567d.tar.bz2 | |
Move goPrevious and goNext to normal mode file
| -rw-r--r-- | content_scripts/mode_normal.coffee | 10 | ||||
| -rw-r--r-- | content_scripts/vimium_frontend.coffee | 13 |
2 files changed, 12 insertions, 11 deletions
diff --git a/content_scripts/mode_normal.coffee b/content_scripts/mode_normal.coffee index 3ddbf294..8547c9e5 100644 --- a/content_scripts/mode_normal.coffee +++ b/content_scripts/mode_normal.coffee @@ -125,6 +125,16 @@ NormalModeCommands = else new PassNextKeyMode count + goPrevious: -> + previousPatterns = Settings.get("previousPatterns") || "" + previousStrings = previousPatterns.split(",").filter( (s) -> s.trim().length ) + findAndFollowRel("prev") || findAndFollowLink(previousStrings) + + goNext: -> + nextPatterns = Settings.get("nextPatterns") || "" + nextStrings = nextPatterns.split(",").filter( (s) -> s.trim().length ) + findAndFollowRel("next") || findAndFollowLink(nextStrings) + focusInput: (count) -> # Focus the first input element on the page, and create overlays to highlight all the input elements, with # the currently-focused element highlighted specially. Tabbing will shift focus to the next input element. diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee index 2cdaa6c5..5549664e 100644 --- a/content_scripts/vimium_frontend.coffee +++ b/content_scripts/vimium_frontend.coffee @@ -460,16 +460,6 @@ findAndFollowRel = (value) -> followLink(element) return true -root.goPrevious = -> - previousPatterns = Settings.get("previousPatterns") || "" - previousStrings = previousPatterns.split(",").filter( (s) -> s.trim().length ) - findAndFollowRel("prev") || findAndFollowLink(previousStrings) - -root.goNext = -> - nextPatterns = Settings.get("nextPatterns") || "" - nextStrings = nextPatterns.split(",").filter( (s) -> s.trim().length ) - findAndFollowRel("next") || findAndFollowLink(nextStrings) - # If we are in the help dialog iframe, then HelpDialog is already defined with the necessary functions. root.HelpDialog ?= helpUI: null @@ -494,7 +484,8 @@ root.Frame = Frame root.windowIsFocused = windowIsFocused root.bgLog = bgLog # These are exported for find mode and link-hints mode. -extend root, {focusFoundLink, selectFoundInputElement, focusThisFrame, FocusSelector} +extend root, {focusFoundLink, selectFoundInputElement, focusThisFrame, FocusSelector, + findAndFollowRel, findAndFollowLink} # These are exported only for the tests. extend root, {installModes} extend window, root unless exports? |