diff options
| author | Stephen Blott | 2015-01-30 14:26:02 +0000 |
|---|---|---|
| committer | Stephen Blott | 2015-01-30 14:26:02 +0000 |
| commit | 0df370cead7085eda47778cbb6046969e8bb19b0 (patch) | |
| tree | 9b8b68576e8b36c70a42443a8b5ae5f16f153023 | |
| parent | 6624740a639f3bb177a56999227bfcd24aba3712 (diff) | |
| download | vimium-0df370cead7085eda47778cbb6046969e8bb19b0.tar.bz2 | |
Visual/edit modes: fix bug entering visual mode from edit mode.
| -rw-r--r-- | content_scripts/mode_visual_edit.coffee | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/content_scripts/mode_visual_edit.coffee b/content_scripts/mode_visual_edit.coffee index 9b39c523..4968fd7f 100644 --- a/content_scripts/mode_visual_edit.coffee +++ b/content_scripts/mode_visual_edit.coffee @@ -393,14 +393,15 @@ class VisualMode extends Movement exitOnEscape: true super extend defaults, options - if @options.parentMode and @selection.type == "Caret" - # We're being called from edit mode, so establish an intial visible selection. - @extendByOneCharacter(forward) or @extendByOneCharacter backward - else if @selection.type in [ "None", "Caret" ] - unless @options.oneMovementOnly or options.immediateMovement - HUD.showForDuration "No selection, entering caret mode first..", 2500 - @changeMode CaretMode - return + unless @options.oneMovementOnly or options.immediateMovement + if @options.parentMode and @selection.type == "Caret" + # We're being called from edit mode, so establish an intial visible selection. + @extendByOneCharacter(forward) or @extendByOneCharacter backward + else if @selection.type in [ "None", "Caret" ] + unless @options.oneMovementOnly or options.immediateMovement + HUD.showForDuration "No selection, entering caret mode first..", 2500 + @changeMode CaretMode + return # Yank on <Enter>. @push |