use action as object

3 files changed, 40 insertions, 44 deletions

diff --git a/src/background/index.js b/src/background/index.js
index 8913a83..b2182f0 100644
--- a/src/background/index.js
+++ b/src/background/index.js
@@ -14,9 +14,9 @@ const keyPressHandle = (request, sender) => {
     return Promise.resolve();
   }
 
-  if (actions.isBackgroundAction(action[0])) {
+  if (actions.isBackgroundAction(action.type)) {
     return doBackgroundAction(sender, action);
-  } else if (actions.isContentAction(action[0])) {
+  } else if (actions.isContentAction(action.type)) {
     return Promise.resolve({
       type: 'response.action',
       action: action
@@ -26,17 +26,17 @@ const keyPressHandle = (request, sender) => {
 };
 
 const doBackgroundAction = (sender, action) => {
-  switch(action[0]) {
+  switch(action.type) {
   case actions.TABS_CLOSE:
     return tabs.closeTab(sender.tab.id);
   case actions.TABS_REOPEN:
     return tabs.reopenTab();
   case actions.TABS_PREV:
-    return tabs.selectPrevTab(sender.tab.index, actions[1] || 1);
+    return tabs.selectPrevTab(sender.tab.index, action.count);
   case actions.TABS_NEXT:
-    return tabs.selectNextTab(sender.tab.index, actions[1] || 1);
+    return tabs.selectNextTab(sender.tab.index, action.count);
   case actions.TABS_RELOAD:
-    return tabs.reload(sender.tab, actions[1] || false);
+    return tabs.reload(sender.tab, actions.cache);
   case actions.ZOOM_IN:
     return zooms.zoomIn();
   case actions.ZOOM_OUT:
diff --git a/src/background/key-queue.js b/src/background/key-queue.js
index d7f0984..b2f5a34 100644
--- a/src/background/key-queue.js
+++ b/src/background/key-queue.js
@@ -1,35 +1,35 @@
 import * as actions from '../shared/actions';
 
 const DEFAULT_KEYMAP = {
-  ':': [ actions.CMD_OPEN ],
-  'o': [ actions.CMD_TABS_OPEN, false ],
-  'O': [ actions.CMD_TABS_OPEN, true ],
-  'b': [ actions.CMD_BUFFER ],
-  'k': [ actions.SCROLL_LINES, -1 ],
-  'j': [ actions.SCROLL_LINES, 1 ],
-  '<C-E>': [ actions.SCROLL_LINES, -1 ],
-  '<C-Y>': [ actions.SCROLL_LINES, 1 ],
-  '<C-U>': [ actions.SCROLL_PAGES, -0.5 ],
-  '<C-D>': [ actions.SCROLL_PAGES, 0.5 ],
-  '<C-B>': [ actions.SCROLL_PAGES, -1 ],
-  '<C-F>': [ actions.SCROLL_PAGES, 1 ],
-  'gg': [ actions.SCROLL_TOP ],
-  'G': [ actions.SCROLL_BOTTOM ],
-  '0': [ actions.SCROLL_LEFT ],
-  '$': [ actions.SCROLL_RIGHT ],
-  'd': [ actions.TABS_CLOSE ],
-  'u': [ actions.TABS_REOPEN],
-  'h': [ actions.TABS_PREV, 1 ],
-  'l': [ actions.TABS_NEXT, 1 ],
-  'r': [ actions.TABS_RELOAD, false ],
-  'R': [ actions.TABS_RELOAD, true ],
-  'zi': [ actions.ZOOM_IN ],
-  'zo': [ actions.ZOOM_OUT ],
-  'zz': [ actions.ZOOM_NEUTRAL],
-  'f': [ actions.FOLLOW_START, false ],
-  'F': [ actions.FOLLOW_START, true ],
-  'H': [ actions.HISTORY_PREV ],
-  'L': [ actions.HISTORY_NEXT ],
+  ':': { type: actions.CMD_OPEN },
+  'o': { type: actions.CMD_TABS_OPEN, alter: false },
+  'O': { type: actions.CMD_TABS_OPEN, alter: true },
+  'b': { type: actions.CMD_BUFFER },
+  'k': { type: actions.SCROLL_LINES, count: -1 },
+  'j': { type: actions.SCROLL_LINES, count: 1 },
+  '<C-E>': { type: actions.SCROLL_LINES, count: -1 },
+  '<C-Y>': { type: actions.SCROLL_LINES, count: 1 },
+  '<C-U>': { type: actions.SCROLL_PAGES, count: -0.5 },
+  '<C-D>': { type: actions.SCROLL_PAGES, count: 0.5 },
+  '<C-B>': { type: actions.SCROLL_PAGES, count: -1 },
+  '<C-F>': { type: actions.SCROLL_PAGES, count: 1 },
+  'gg': { type: actions.SCROLL_TOP },
+  'G': { type: actions.SCROLL_BOTTOM },
+  '0': { type: actions.SCROLL_LEFT },
+  '$': { type: actions.SCROLL_RIGHT },
+  'd': { type: actions.TABS_CLOSE },
+  'u': { type: actions.TABS_REOPEN },
+  'h': { type: actions.TABS_PREV, count: 1 },
+  'l': { type: actions.TABS_NEXT, count: 1 },
+  'r': { type: actions.TABS_RELOAD, cache: false },
+  'R': { type: actions.TABS_RELOAD, cache: true },
+  'zi': { type: actions.ZOOM_IN },
+  'zo': { type: actions.ZOOM_OUT },
+  'zz': { type: actions.ZOOM_NEUTRAL },
+  'f': { type: actions.FOLLOW_START, newTab: false },
+  'F': { type: actions.FOLLOW_START, newTab: true },
+  'H': { type: actions.HISTORY_PREV },
+  'L': { type: actions.HISTORY_NEXT },
 }
 
 export default class KeyQueue {
diff --git a/src/content/index.js b/src/content/index.js
index fdc7e89..27dc581 100644
--- a/src/content/index.js
+++ b/src/content/index.js
@@ -8,16 +8,12 @@ import Follow from './follow';
 let vvConsole = new ConsoleFrame(window);
 
 const doAction = (action) => {
-  if (typeof action === 'undefined' || action === null) {
-    return;
-  }
-
-  switch (action[0]) {
+  switch (action.type) {
   case actions.CMD_OPEN:
     vvConsole.showCommand('');
     break;
   case actions.CMD_TABS_OPEN:
-    if (action[1] || false) {
+    if (action.alter) {
       // alter url
       vvConsole.showCommand('open ' + window.location.href);
     } else {
@@ -28,10 +24,10 @@ const doAction = (action) => {
     vvConsole.showCommand('buffer ');
     break;
   case actions.SCROLL_LINES:
-    scrolls.scrollLines(window, action[1]);
+    scrolls.scrollLines(window, action.count);
     break;
   case actions.SCROLL_PAGES:
-    scrolls.scrollPages(window, action[1]);
+    scrolls.scrollPages(window, action.count);
     break;
   case actions.SCROLL_TOP:
     scrolls.scrollTop(window);
@@ -46,7 +42,7 @@ const doAction = (action) => {
     scrolls.scrollRight(window);
     break;
   case actions.FOLLOW_START:
-    new Follow(window.document, action[1] || false);
+    new Follow(window.document, action.newTab);
     break;
   case actions.HISTORY_PREV:
     histories.prev(window);