Merge branch 'some-features'

4 files changed, 66 insertions, 1 deletions

diff --git a/src/background/index.js b/src/background/index.js
index f3bd65a..f1a7217 100644
--- a/src/background/index.js
+++ b/src/background/index.js
@@ -1,6 +1,7 @@
 import * as actions from '../shared/actions';
 import * as tabs from './tabs';
 import * as commands from './commands';
+import * as zooms from './zooms';
 import KeyQueue from './key-queue';
 
 const queue = new KeyQueue();
@@ -38,6 +39,18 @@ const doBackgroundAction = (sender, action) => {
   case actions.TABS_NEXT:
     tabs.selectNextTab(sender.tab.index, actions[1] || 1);
     break;
+  case actions.TABS_RELOAD:
+    tabs.reload(sender.tab, actions[1] || false);
+    break;
+  case actions.ZOOM_IN:
+    zooms.zoomIn();
+    break;
+  case actions.ZOOM_OUT:
+    zooms.zoomOut();
+    break;
+  case actions.ZOOM_NEUTRAL:
+    zooms.neutral();
+    break;
   }
 }
 
diff --git a/src/background/key-queue.js b/src/background/key-queue.js
index 5693b36..f5f9a53 100644
--- a/src/background/key-queue.js
+++ b/src/background/key-queue.js
@@ -13,8 +13,15 @@ const DEFAULT_KEYMAP = [
   { keys: [{ code: KeyboardEvent.DOM_VK_U }], action: [ actions.TABS_REOPEN]},
   { keys: [{ code: KeyboardEvent.DOM_VK_H }], action: [ actions.TABS_PREV, 1 ]},
   { keys: [{ code: KeyboardEvent.DOM_VK_L }], action: [ actions.TABS_NEXT, 1 ]},
+  { keys: [{ code: KeyboardEvent.DOM_VK_R }], action: [ actions.TABS_RELOAD, false ]},
+  { keys: [{ code: KeyboardEvent.DOM_VK_R, shift: true }], action: [ actions.TABS_RELOAD, true ]},
+  { keys: [{ code: KeyboardEvent.DOM_VK_Z }, { code: KeyboardEvent.DOM_VK_I }], action: [ actions.ZOOM_IN ]},
+  { keys: [{ code: KeyboardEvent.DOM_VK_Z }, { code: KeyboardEvent.DOM_VK_O }], action: [ actions.ZOOM_OUT ]},
+  { keys: [{ code: KeyboardEvent.DOM_VK_Z }, { code: KeyboardEvent.DOM_VK_Z }], action: [ actions.ZOOM_NEUTRAL]},
   { keys: [{ code: KeyboardEvent.DOM_VK_F }], action: [ actions.FOLLOW_START, false ]},
   { keys: [{ code: KeyboardEvent.DOM_VK_F, shift: true }], action: [ actions.FOLLOW_START, true ]},
+  { keys: [{ code: KeyboardEvent.DOM_VK_H, shift: true }], action: [ actions.HISTORY_PREV ]},
+  { keys: [{ code: KeyboardEvent.DOM_VK_L, shift: true }], action: [ actions.HISTORY_NEXT ]},
 ]
 
 export default class KeyQueue {
diff --git a/src/background/tabs.js b/src/background/tabs.js
index 899284d..56f86eb 100644
--- a/src/background/tabs.js
+++ b/src/background/tabs.js
@@ -40,4 +40,11 @@ const selectNextTab = (current, count) => {
   });
 };
 
-export { closeTab, reopenTab, selectNextTab, selectPrevTab };
+const reload = (current, cache) => {
+  browser.tabs.reload(
+    current.id,
+    { bypassCache: cache }
+  );
+};
+
+export { closeTab, reopenTab, selectNextTab, selectPrevTab, reload };
diff --git a/src/background/zooms.js b/src/background/zooms.js
new file mode 100644
index 0000000..bb65030
--- /dev/null
+++ b/src/background/zooms.js
@@ -0,0 +1,38 @@
+// For chromium
+// const ZOOM_SETTINGS = [
+//   0.25, 0.33, 0.50, 0.66, 0.75, 0.80, 0.90, 1.00,
+//   1.10, 1.25, 1.50, 1.75, 2.00, 2.50, 3.00, 4.00, 5.00
+// ];
+
+const ZOOM_SETTINGS = [
+  0.33, 0.50, 0.66, 0.75, 0.80, 0.90, 1.00,
+  1.10, 1.25, 1.50, 1.75, 2.00, 2.50, 3.00
+];
+
+const zoomIn = (tabId = undefined) => {
+  browser.tabs.getZoom(tabId).then((factor) => {
+    for (let f of ZOOM_SETTINGS) {
+      if (f > factor) {
+        browser.tabs.setZoom(tabId, f);
+        break;
+      }
+    }
+  });
+};
+
+const zoomOut = (tabId = undefined) => {
+  browser.tabs.getZoom(tabId).then((factor) => {
+    for (let f of [].concat(ZOOM_SETTINGS).reverse()) {
+      if (f < factor) {
+        browser.tabs.setZoom(tabId, f);
+        break;
+      }
+    }
+  });
+};
+
+const neutral = (tabId = undefined) => {
+  browser.tabs.setZoom(tabId, 1);
+};
+
+export { zoomIn, zoomOut, neutral };