Merge branch 'master' of http://github.com/philc/vimium

* 'master' of http://github.com/philc/vimium:
  Revert a rename - not sure why I committed that.
  Oops, fixed a regression.
  Code cleanup & README changes for the multiple link hints patch.
  Fix some frame logic and disable focusing the largest one for now because it's buggy with iframes.
  A bunch of changes having to do with the frame support patch:
  Updated README
  Added ab3 to Credits ;)
  Clean up code
  added resetLinkHintsMode
  Added activeteLinkHintsModeWithQueue and resetLinkHintsMode to linkHints.js and added 'q cmd' and 'q help cmd' to commands.js
  Update README with new/changed key mappings.
  Command to go to next frame.
  Only show the Help Dialog on the focused frame.
  Fix view source toggle when inside a frame.
  Basic Support for Frames

Conflicts:

	commands.js
	manifest.json

1 files changed, 13 insertions, 5 deletions

diff --git a/commands.js b/commands.js
index e9a0bd41..fb264510 100644
--- a/commands.js
+++ b/commands.js
@@ -97,7 +97,7 @@ function clearKeyMappingsAndSetDefaults() {
   mapKeyToCommand('<c-f>', 'scrollFullPageDown');
   mapKeyToCommand('<c-b>', 'scrollFullPageUp');
   mapKeyToCommand('r', 'reload');
-  mapKeyToCommand('gf', 'toggleViewSource');
+  mapKeyToCommand('gs', 'toggleViewSource');
 
   mapKeyToCommand('i', 'enterInsertMode');
 
@@ -110,8 +110,9 @@ function clearKeyMappingsAndSetDefaults() {
 
   mapKeyToCommand('gi', 'focusInput');
 
-  mapKeyToCommand('f', 'activateLinkHintsMode');
-  mapKeyToCommand('F', 'activateLinkHintsModeToOpenInNewTab');
+  mapKeyToCommand('f',     'activateLinkHintsMode');
+  mapKeyToCommand('F',     'activateLinkHintsModeToOpenInNewTab');
+  mapKeyToCommand('<a-f>', 'activateLinkHintsModeWithQueue');
 
   mapKeyToCommand('/', 'enterFindMode');
   mapKeyToCommand('n', 'performFind');
@@ -127,8 +128,12 @@ function clearKeyMappingsAndSetDefaults() {
   mapKeyToCommand('t', 'createTab');
   mapKeyToCommand('d', 'removeTab');
   mapKeyToCommand('u', 'restoreTab');
+
   mapKeyToCommand('b', 'activateBookmarkFindMode');
   mapKeyToCommand('B', 'activateBookmarkFindModeToOpenInNewTab')
+
+  mapKeyToCommand('gf', 'nextFrame');
+
 }
 
 // Navigating the current page:
@@ -158,6 +163,7 @@ addCommand('focusInput',          'Focus the first (or n-th) text box on the pag
 
 addCommand('activateLinkHintsMode',               'Enter link hints mode to open links in current tab');
 addCommand('activateLinkHintsModeToOpenInNewTab', 'Enter link hints mode to open links in new tab');
+addCommand('activateLinkHintsModeWithQueue',      'Enter link hints mode to open multiple links in a new tab');
 
 addCommand('activateBookmarkFindMode',            'Find bookmarks to open in current tab');
 addCommand('activateBookmarkFindModeToOpenInNewTab', 'Find bookmarks to open in new tab');
@@ -180,6 +186,8 @@ addCommand('createTab',           'Create new tab',    true);
 addCommand('removeTab',           'Close current tab', true);
 addCommand('restoreTab',          "Restore closed tab", true);
 
+addCommand('nextFrame',           "Cycle forward to the next frame on the page", true);
+
 
 // An ordered listing of all available commands, grouped by type. This is the order they will
 // be shown in the help page.
@@ -190,8 +198,8 @@ var commandGroups = {
      "scrollPageUp", "scrollFullPageDown",
      "reload", "toggleViewSource", "zoomIn", "zoomOut", "copyCurrentUrl", "goUp",
      "enterInsertMode", "focusInput",
-     "activateLinkHintsMode", "activateLinkHintsModeToOpenInNewTab",
-     "enterFindMode", "performFind", "performBackwardsFind"],
+     "activateLinkHintsMode", "activateLinkHintsModeToOpenInNewTab", "activateLinkHintsModeWithQueue",
+     "enterFindMode", "performFind", "performBackwardsFind", "nextFrame"],
   historyNavigation:
     ["goBack", "goForward"],
   tabManipulation: