diff options
| author | Stephen Blott | 2015-02-09 11:40:53 +0000 | 
|---|---|---|
| committer | Stephen Blott | 2015-02-09 11:40:53 +0000 | 
| commit | 0bf605a934115083e700f5de090f39841417482a (patch) | |
| tree | 408c191bd702da6847bca9943f6eba93ad28b209 /background_scripts/commands.coffee | |
| parent | ac648a0e9f53c2fc359daa68309c25dd8c9db031 (diff) | |
| parent | ed306994697f6f9f5e13f9d018b5c7ffa2fff680 (diff) | |
| download | vimium-0bf605a934115083e700f5de090f39841417482a.tar.bz2 | |
Merge branch 'visual-and-edit-modes'
Conflicts:
	background_scripts/main.coffee
	content_scripts/vimium_frontend.coffee
	lib/keyboard_utils.coffee
Diffstat (limited to 'background_scripts/commands.coffee')
| -rw-r--r-- | background_scripts/commands.coffee | 6 | 
1 files changed, 6 insertions, 0 deletions
| diff --git a/background_scripts/commands.coffee b/background_scripts/commands.coffee index 114f46ce..79cb9ee0 100644 --- a/background_scripts/commands.coffee +++ b/background_scripts/commands.coffee @@ -112,6 +112,8 @@ Commands =        "goToRoot",        "enterInsertMode",        "enterVisualMode", +      "enterVisualLineMode", +      # "enterEditMode",        "focusInput",        "LinkHints.activateMode",        "LinkHints.activateModeToOpenInNewTab", @@ -197,6 +199,8 @@ defaultKeyMappings =    "i": "enterInsertMode"    "v": "enterVisualMode" +  "V": "enterVisualLineMode" +  # "gv": "enterEditMode"    "H": "goBack"    "L": "goForward" @@ -286,6 +290,8 @@ commandDescriptions =    enterInsertMode: ["Enter insert mode", { noRepeat: true }]    enterVisualMode: ["Enter visual mode (not yet implemented)", { noRepeat: true }] +  enterVisualLineMode: ["Enter visual line mode (not yet implemented)", { noRepeat: true }] +  # enterEditMode: ["Enter vim-like edit mode (not yet implemented)", { noRepeat: true }]    focusInput: ["Focus the first text box on the page. Cycle between them using tab",      { passCountToFunction: true }] | 
