Merge branch 'master' into develop

akhodakivskiy · Mar 19, 2016 · 4017f7a · 4017f7a
2 parents 44b3e1b + 45e9f38
commit 4017f7a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -10,15 +10,15 @@ Steps to reproduce:
 2. 
 3. 
 
-[Description]
+Expected result: 
 
+Actual result: 
 
-| OR, for feature requests:
 
+| OR, for feature requests:
 
-Detailed use case example:
 
-[Description]
+Detailed use case example: 
 
 
 | ALWAYS include:
@@ -29,8 +29,7 @@ Firefox version:
 OS: 
 Keyboard language: 
 Worked before: 
-Example URL(s):
-- 
+Example URL(s): 
 
 
 | EXAMPLE:
@@ -41,9 +40,13 @@ Example URL(s):
 | 2. Focus the online terminal.
 | 3. Type something into it.
 |
-| VimFx doesn’t recognize the online terminal as a text input, so instead of
-| typing into it I end up activating VimFx commands. A work-around is to use
-| Ignore mode.
+| Expected reult: VimFx recognizes the terminal as a text input, automatically
+| allowing to type into it.
+|
+| Actual result: Instead of typing into the terminal I end up activating VimFx
+| commands.
+|
+| A work-around is to use Ignore mode.
 |
 | VimFx version: 0.11.0
 | Firefox version: 43

diff --git a/documentation/tools.md b/documentation/tools.md
@@ -220,5 +220,5 @@ Steps:
 The idea is to use the contents of `README.md` as the add-on description on
 addons.mozilla.org. You can print it as HTML by running `gulp readme`.
 
-[versioning guidelines]: CONTRIBUTING_CODE.md#versioning-and-branches
+[versioning guidelines]: CONTRIBUTING-CODE.md#versioning-and-branches
 [valid Firefox versions]: https://addons.mozilla.org/en-US/firefox/pages/appversions/
diff --git a/extension/lib/commands.coffee b/extension/lib/commands.coffee
@@ -419,8 +419,9 @@ helper_follow = (name, vim, callback, count = null) ->
       vim.enterMode('normal')
   )
 
-helper_follow_clickable = ({inTab, inBackground}, {vim, count = 1}) ->
+helper_follow_clickable = (options, {vim, count = 1}) ->
   callback = (marker, timesLeft, keyStr) ->
+    {inTab, inBackground} = options
     {type, elementIndex} = marker.wrapper
     isLast = (timesLeft == 1)
     isLink = (type == 'link')
@@ -458,7 +459,7 @@ helper_follow_clickable = ({inTab, inBackground}, {vim, count = 1}) ->
 
     return not isLast
 
-  name = if inTab then 'follow_in_tab' else 'follow'
+  name = if options.inTab then 'follow_in_tab' else 'follow'
   helper_follow(name, vim, callback, count)
 
 commands.follow =