From e73d405c5640afda27775285f19516a271b5cefb Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Sat, 12 Aug 2017 11:08:43 +0900
Subject: message passing between background and content

---
 src/content/index.js | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 src/content/index.js

(limited to 'src/content')

diff --git a/src/content/index.js b/src/content/index.js
new file mode 100644
index 0000000..0fa0720
--- /dev/null
+++ b/src/content/index.js
@@ -0,0 +1,9 @@
+window.addEventListener("keypress", (e) => {
+  browser.runtime.sendMessage({
+    which: e.which || e.keyCode,
+  }).then((msg) => {
+    console.log(`Message from the background script:  ${msg.response}`);
+  }, (err) => {
+    console.log(`Error: ${err}`);
+  });
+});
-- 
cgit v1.2.3


From 8e5ceebf61088727fdca524d062162fbdfc86155 Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Sat, 12 Aug 2017 12:55:37 +0900
Subject: implement simple tab switch

---
 src/background/index.js | 18 ++++++++++++++++--
 src/background/tabs.js  | 23 +++++++++++++++++++++++
 src/content/index.js    | 11 +++++++----
 3 files changed, 46 insertions(+), 6 deletions(-)
 create mode 100644 src/background/tabs.js

(limited to 'src/content')

diff --git a/src/background/index.js b/src/background/index.js
index ee02f63..d4e0098 100644
--- a/src/background/index.js
+++ b/src/background/index.js
@@ -1,4 +1,18 @@
+import * as tabs from './tabs';
+
+const KEY_MAP = {
+  'tabs.prev': 104,
+  'tabs.next': 108
+};
+
 browser.runtime.onMessage.addListener((request, sender, sendResponse) => {
-  console.log("Pressed " + request.which);
-  sendResponse({ response: "Response from background script" });
+  switch (request.key) {
+  case KEY_MAP['tabs.prev']:
+    tabs.selectPrevTab(sender.tab.index);
+    break;
+  case KEY_MAP['tabs.next']:
+    tabs.selectNextTab(sender.tab.index);
+    break;
+  }
+  sendResponse();
 });
diff --git a/src/background/tabs.js b/src/background/tabs.js
new file mode 100644
index 0000000..20ef286
--- /dev/null
+++ b/src/background/tabs.js
@@ -0,0 +1,23 @@
+const selectPrevTab = (current) => {
+  chrome.tabs.query({ currentWindow: true }, (tabs) => {
+    if (tabs.length < 2) {
+      return;
+    }
+    let select = (current - 1) % tabs.length
+    let id = tabs[select].id;
+    chrome.tabs.update(id, { active: true })
+  });
+};
+
+const selectNextTab = (current) => {
+  chrome.tabs.query({ currentWindow: true }, (tabs) => {
+    if (tabs.length < 2) {
+      return;
+    }
+    let select = (current + 1 + tabs.length) % tabs.length
+    let id = tabs[select].id;
+    chrome.tabs.update(id, { active: true })
+  });
+};
+
+export { selectNextTab, selectPrevTab };
diff --git a/src/content/index.js b/src/content/index.js
index 0fa0720..fceed4b 100644
--- a/src/content/index.js
+++ b/src/content/index.js
@@ -1,9 +1,12 @@
 window.addEventListener("keypress", (e) => {
   browser.runtime.sendMessage({
-    which: e.which || e.keyCode,
-  }).then((msg) => {
-    console.log(`Message from the background script:  ${msg.response}`);
+    key: e.which || e.keyCode,
+    shift: e.shift,
+    alt: e.alt,
+    meta: e.meta,
+    ctrl: e.ctrl,
+  }).then(() => {
   }, (err) => {
-    console.log(`Error: ${err}`);
+    console.log(`Vim Vixen: ${err}`);
   });
 });
-- 
cgit v1.2.3


From 6bdacc7758d6bda37ec9a1ecd64a65b7482fefed Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Sat, 12 Aug 2017 23:01:36 +0900
Subject: implement simple scrolling

---
 src/background/index.js | 14 ++++++++++++--
 src/content/index.js    | 18 +++++++++++++++++-
 src/content/scrolls.js  | 27 +++++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 src/content/scrolls.js

(limited to 'src/content')

diff --git a/src/background/index.js b/src/background/index.js
index d4e0098..793f330 100644
--- a/src/background/index.js
+++ b/src/background/index.js
@@ -2,10 +2,14 @@ import * as tabs from './tabs';
 
 const KEY_MAP = {
   'tabs.prev': 104,
-  'tabs.next': 108
+  'tabs.next': 108,
+  'scroll.up': 107,
+  'scroll.down': 106
 };
 
 browser.runtime.onMessage.addListener((request, sender, sendResponse) => {
+  let response = null;
+
   switch (request.key) {
   case KEY_MAP['tabs.prev']:
     tabs.selectPrevTab(sender.tab.index);
@@ -13,6 +17,12 @@ browser.runtime.onMessage.addListener((request, sender, sendResponse) => {
   case KEY_MAP['tabs.next']:
     tabs.selectNextTab(sender.tab.index);
     break;
+  case KEY_MAP['scroll.up']:
+    response = 'scroll.up'
+    break;
+  case KEY_MAP['scroll.down']:
+    response = 'scroll.down'
+    break;
   }
-  sendResponse();
+  sendResponse(response);
 });
diff --git a/src/content/index.js b/src/content/index.js
index fceed4b..e77bb0a 100644
--- a/src/content/index.js
+++ b/src/content/index.js
@@ -1,3 +1,16 @@
+import * as scrolls from './scrolls';
+
+const invokeEvent = (type) => {
+  switch (type) {
+  case 'scroll.up':
+    scrolls.scrollUp(window);
+    break;
+  case 'scroll.down':
+    scrolls.scrollDown(window);
+    break;
+  }
+}
+
 window.addEventListener("keypress", (e) => {
   browser.runtime.sendMessage({
     key: e.which || e.keyCode,
@@ -5,7 +18,10 @@ window.addEventListener("keypress", (e) => {
     alt: e.alt,
     meta: e.meta,
     ctrl: e.ctrl,
-  }).then(() => {
+  }).then((response) => {
+    if (response) {
+      invokeEvent(response);
+    }
   }, (err) => {
     console.log(`Vim Vixen: ${err}`);
   });
diff --git a/src/content/scrolls.js b/src/content/scrolls.js
new file mode 100644
index 0000000..76d1aa2
--- /dev/null
+++ b/src/content/scrolls.js
@@ -0,0 +1,27 @@
+const SCROLL_DELTA = 48;
+
+const scrollUp = (page) => {
+  let x = page.scrollX;
+  var y = page.scrollY - SCROLL_DELTA;
+  page.scrollTo(x, y);
+};
+
+const scrollDown = (page) => {
+  let x = page.scrollX;
+  var y = page.scrollY + SCROLL_DELTA;
+  page.scrollTo(x, y);
+};
+
+const scrollToTop = (page) => {
+  let x = page.scrollX;
+  var y = page.scrollMaxY;
+  page.scrollTo(x, y);
+};
+
+const scrollToBottom = (page) => {
+  let x = page.scrollX;
+  var y = 0;
+  page.scrollTo(x, y);
+};
+
+export { scrollUp, scrollDown, scrollToTop, scrollToBottom }
-- 
cgit v1.2.3


From e7342e9c237e1deea69ed66e07b7f79cd534056e Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Sun, 13 Aug 2017 10:27:24 +0900
Subject: use key-code

---
 src/background/index.js | 10 +++++-----
 src/content/index.js    |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/content')

diff --git a/src/background/index.js b/src/background/index.js
index 793f330..8c9c418 100644
--- a/src/background/index.js
+++ b/src/background/index.js
@@ -1,16 +1,16 @@
 import * as tabs from './tabs';
 
 const KEY_MAP = {
-  'tabs.prev': 104,
-  'tabs.next': 108,
-  'scroll.up': 107,
-  'scroll.down': 106
+  'tabs.prev': KeyboardEvent.DOM_VK_H,
+  'tabs.next': KeyboardEvent.DOM_VK_L,
+  'scroll.up': KeyboardEvent.DOM_VK_K,
+  'scroll.down': KeyboardEvent.DOM_VK_J
 };
 
 browser.runtime.onMessage.addListener((request, sender, sendResponse) => {
   let response = null;
 
-  switch (request.key) {
+  switch (request.code) {
   case KEY_MAP['tabs.prev']:
     tabs.selectPrevTab(sender.tab.index);
     break;
diff --git a/src/content/index.js b/src/content/index.js
index e77bb0a..514f964 100644
--- a/src/content/index.js
+++ b/src/content/index.js
@@ -11,9 +11,9 @@ const invokeEvent = (type) => {
   }
 }
 
-window.addEventListener("keypress", (e) => {
+window.addEventListener("keydown", (e) => {
   browser.runtime.sendMessage({
-    key: e.which || e.keyCode,
+    code: e.keyCode,
     shift: e.shift,
     alt: e.alt,
     meta: e.meta,
-- 
cgit v1.2.3


From 082450928a35ea8d35fdbcd176dbd972e45acfec Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Sun, 13 Aug 2017 12:00:39 +0900
Subject: use key-queue for input

---
 src/background/index.js     | 56 ++++++++++++++++++++++++++++++---------------
 src/background/key-queue.js | 28 +++++++++++++++++++++++
 src/background/keys.js      | 21 +++++++++++++++++
 src/background/tabs.js      |  8 +++----
 src/content/index.js        | 29 +++++++++++++----------
 src/content/scrolls.js      |  8 +++----
 src/shared/actions.js       | 22 ++++++++++++++++++
 7 files changed, 133 insertions(+), 39 deletions(-)
 create mode 100644 src/background/key-queue.js
 create mode 100644 src/background/keys.js
 create mode 100644 src/shared/actions.js

(limited to 'src/content')

diff --git a/src/background/index.js b/src/background/index.js
index 8c9c418..604ea92 100644
--- a/src/background/index.js
+++ b/src/background/index.js
@@ -1,28 +1,46 @@
+import * as actions from '../shared/actions';
 import * as tabs from './tabs';
+import KeyQueue from './key-queue';
 
-const KEY_MAP = {
-  'tabs.prev': KeyboardEvent.DOM_VK_H,
-  'tabs.next': KeyboardEvent.DOM_VK_L,
-  'scroll.up': KeyboardEvent.DOM_VK_K,
-  'scroll.down': KeyboardEvent.DOM_VK_J
-};
+const queue = new KeyQueue();
 
-browser.runtime.onMessage.addListener((request, sender, sendResponse) => {
-  let response = null;
+const keyDownHandle = (request) => {
+  return queue.push({
+    code: request.code,
+    shift: request.shift,
+    ctrl: request.ctrl,
+    alt: request.alt,
+    meta: request.meta
+  })
+}
 
-  switch (request.code) {
-  case KEY_MAP['tabs.prev']:
-    tabs.selectPrevTab(sender.tab.index);
-    break;
-  case KEY_MAP['tabs.next']:
-    tabs.selectNextTab(sender.tab.index);
+const doBackgroundAction = (sender, action) => {
+  switch(action[0]) {
+  case actions.TABS_PREV:
+    tabs.selectPrevTab(sender.tab.index, actions[1] || 1);
     break;
-  case KEY_MAP['scroll.up']:
-    response = 'scroll.up'
+  case actions.TABS_NEXT:
+    tabs.selectNextTab(sender.tab.index, actions[1] || 1);
     break;
-  case KEY_MAP['scroll.down']:
-    response = 'scroll.down'
+  }
+}
+
+browser.runtime.onMessage.addListener((request, sender, sendResponse) => {
+  let action = null;
+
+  switch (request.type) {
+  case 'event.keydown':
+    action = keyDownHandle(request);
     break;
   }
-  sendResponse(response);
+
+  if (action == null) {
+    return;
+  }
+
+  if (actions.isBackgroundAction(action[0])) {
+    doBackgroundAction(sender, action);
+  } else if (actions.isContentAction(action[0])) {
+    sendResponse(action);
+  }
 });
diff --git a/src/background/key-queue.js b/src/background/key-queue.js
new file mode 100644
index 0000000..e14e995
--- /dev/null
+++ b/src/background/key-queue.js
@@ -0,0 +1,28 @@
+import * as keys from './keys';
+import * as actions from '../shared/actions';
+
+const DEFAULT_KEYMAP = [
+  { keys: [{ code: KeyboardEvent.DOM_VK_K }], action: [ actions.SCROLL_UP, 1 ]},
+  { keys: [{ code: KeyboardEvent.DOM_VK_J }], action: [ actions.SCROLL_DOWN, 1 ]},
+  { keys: [{ code: KeyboardEvent.DOM_VK_H }], action: [ actions.TABS_PREV, 1 ]},
+  { keys: [{ code: KeyboardEvent.DOM_VK_L }], action: [ actions.TABS_NEXT, 1 ]},
+]
+
+export default class KeyQueue {
+
+  constructor(keymap) {
+    this.data = [];
+    this.keymap = keymap;
+  }
+
+  push(key) {
+    this.data.push(key);
+    for (let map of DEFAULT_KEYMAP) {
+      if (keys.keysEquals(map.keys, this.data)) {
+        this.data = [];
+        return map.action
+      }
+    }
+    return null;
+  }
+}
diff --git a/src/background/keys.js b/src/background/keys.js
new file mode 100644
index 0000000..d6a94fb
--- /dev/null
+++ b/src/background/keys.js
@@ -0,0 +1,21 @@
+const keyEquals = (key1, key2) => {
+  return (key1.code === key2.code) &&
+    ((key1.shift || false) === (key2.shift || false)) &&
+    ((key1.ctrl || false) === (key2.ctrl || false)) &&
+    ((key1.alt || false) === (key2.alt || false)) &&
+    ((key1.meta || false) === (key2.meta || false));
+};
+
+const keysEquals = (keys1, keys2) => {
+  if (keys1.length !== keys2.length) {
+    return false;
+  }
+  for (let i = 0; i < keys1.length; ++i) {
+    if (!keyEquals(keys1[i], keys2[i])) {
+      return false;
+    }
+  }
+  return true;
+}
+
+export { keyEquals, keysEquals };
diff --git a/src/background/tabs.js b/src/background/tabs.js
index 20ef286..000bd7d 100644
--- a/src/background/tabs.js
+++ b/src/background/tabs.js
@@ -1,20 +1,20 @@
-const selectPrevTab = (current) => {
+const selectPrevTab = (current, count) => {
   chrome.tabs.query({ currentWindow: true }, (tabs) => {
     if (tabs.length < 2) {
       return;
     }
-    let select = (current - 1) % tabs.length
+    let select = (current - count) % tabs.length
     let id = tabs[select].id;
     chrome.tabs.update(id, { active: true })
   });
 };
 
-const selectNextTab = (current) => {
+const selectNextTab = (current, count) => {
   chrome.tabs.query({ currentWindow: true }, (tabs) => {
     if (tabs.length < 2) {
       return;
     }
-    let select = (current + 1 + tabs.length) % tabs.length
+    let select = (current + count + tabs.length) % tabs.length
     let id = tabs[select].id;
     chrome.tabs.update(id, { active: true })
   });
diff --git a/src/content/index.js b/src/content/index.js
index 514f964..e882a68 100644
--- a/src/content/index.js
+++ b/src/content/index.js
@@ -1,28 +1,33 @@
 import * as scrolls from './scrolls';
 
-const invokeEvent = (type) => {
-  switch (type) {
+const invokeEvent = (action) => {
+  if (typeof action === 'undefined' || action === null) {
+    return;
+  }
+
+  switch (action[0]) {
   case 'scroll.up':
-    scrolls.scrollUp(window);
+    scrolls.scrollUp(window, action[1] || 1);
     break;
   case 'scroll.down':
-    scrolls.scrollDown(window);
+    scrolls.scrollDown(window, action[1] || 1);
     break;
   }
 }
 
 window.addEventListener("keydown", (e) => {
-  browser.runtime.sendMessage({
+  let request = {
+    type: 'event.keydown',
     code: e.keyCode,
     shift: e.shift,
     alt: e.alt,
     meta: e.meta,
     ctrl: e.ctrl,
-  }).then((response) => {
-    if (response) {
-      invokeEvent(response);
-    }
-  }, (err) => {
-    console.log(`Vim Vixen: ${err}`);
-  });
+  }
+
+  browser.runtime.sendMessage(request)
+    .then(invokeEvent,
+      (err) => {
+        console.log(`Vim Vixen: ${err}`);
+      });
 });
diff --git a/src/content/scrolls.js b/src/content/scrolls.js
index 76d1aa2..e640384 100644
--- a/src/content/scrolls.js
+++ b/src/content/scrolls.js
@@ -1,14 +1,14 @@
 const SCROLL_DELTA = 48;
 
-const scrollUp = (page) => {
+const scrollUp = (page, count) => {
   let x = page.scrollX;
-  var y = page.scrollY - SCROLL_DELTA;
+  var y = page.scrollY - SCROLL_DELTA * count;
   page.scrollTo(x, y);
 };
 
-const scrollDown = (page) => {
+const scrollDown = (page, count) => {
   let x = page.scrollX;
-  var y = page.scrollY + SCROLL_DELTA;
+  var y = page.scrollY + SCROLL_DELTA * count;
   page.scrollTo(x, y);
 };
 
diff --git a/src/shared/actions.js b/src/shared/actions.js
new file mode 100644
index 0000000..2e10810
--- /dev/null
+++ b/src/shared/actions.js
@@ -0,0 +1,22 @@
+export const TABS_PREV = 'tabs.prev';
+export const TABS_NEXT = 'tabs.next';
+export const SCROLL_UP = 'scroll.up';
+export const SCROLL_DOWN = 'scroll.down';
+
+const BACKGROUND_ACTION_SET = new Set([
+  TABS_PREV,
+  TABS_NEXT
+]);
+
+const CONTENT_ACTION_SET = new Set([
+  SCROLL_UP,
+  SCROLL_DOWN
+]);
+
+export const isBackgroundAction = (action) => {
+  return BACKGROUND_ACTION_SET.has(action);
+};
+
+export const isContentAction = (action) => {
+  return CONTENT_ACTION_SET.has(action);
+};
-- 
cgit v1.2.3


From bbc8ff515efaa39c7064307ebf30e2600c4d9a6c Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Sun, 13 Aug 2017 12:32:11 +0900
Subject: ignore input-element

---
 src/content/index.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/content')

diff --git a/src/content/index.js b/src/content/index.js
index e882a68..88a668e 100644
--- a/src/content/index.js
+++ b/src/content/index.js
@@ -16,6 +16,10 @@ const invokeEvent = (action) => {
 }
 
 window.addEventListener("keydown", (e) => {
+  if (e.target instanceof HTMLInputElement) {
+    return;
+  }
+
   let request = {
     type: 'event.keydown',
     code: e.keyCode,
-- 
cgit v1.2.3


From 41069cf527ed159d6c5ff89cc77867537025c9f5 Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Sun, 13 Aug 2017 16:37:47 +0900
Subject: implement gg/G commands

---
 src/background/key-queue.js |  2 ++
 src/background/keys.js      |  2 +-
 src/content/index.js        | 29 +++++++++++++++++++++++------
 src/content/scrolls.js      | 14 +++++++-------
 src/shared/actions.js       |  6 +++++-
 5 files changed, 38 insertions(+), 15 deletions(-)

(limited to 'src/content')

diff --git a/src/background/key-queue.js b/src/background/key-queue.js
index cd8d865..e21399e 100644
--- a/src/background/key-queue.js
+++ b/src/background/key-queue.js
@@ -4,6 +4,8 @@ import * as actions from '../shared/actions';
 const DEFAULT_KEYMAP = [
   { keys: [{ code: KeyboardEvent.DOM_VK_K }], action: [ actions.SCROLL_UP, 1 ]},
   { keys: [{ code: KeyboardEvent.DOM_VK_J }], action: [ actions.SCROLL_DOWN, 1 ]},
+  { keys: [{ code: KeyboardEvent.DOM_VK_G }, { code: KeyboardEvent.DOM_VK_G }], action: [ actions.SCROLL_TOP ]},
+  { keys: [{ code: KeyboardEvent.DOM_VK_G, shift: true }], action: [ actions.SCROLL_BOTTOM ]},
   { keys: [{ code: KeyboardEvent.DOM_VK_H }], action: [ actions.TABS_PREV, 1 ]},
   { keys: [{ code: KeyboardEvent.DOM_VK_L }], action: [ actions.TABS_NEXT, 1 ]},
 ]
diff --git a/src/background/keys.js b/src/background/keys.js
index 802340d..2fd00a2 100644
--- a/src/background/keys.js
+++ b/src/background/keys.js
@@ -10,7 +10,7 @@ const hasPrefix = (keys, prefix) => {
   if (keys.length < prefix.length) {
     return false;
   }
-  for (let i = 0; i < keys.length; ++i) {
+  for (let i = 0; i < prefix.length; ++i) {
     if (!identifyKey(keys[i], prefix[i])) {
       return false;
     }
diff --git a/src/content/index.js b/src/content/index.js
index 88a668e..03efc5e 100644
--- a/src/content/index.js
+++ b/src/content/index.js
@@ -1,4 +1,5 @@
 import * as scrolls from './scrolls';
+import * as actions from '../shared/actions';
 
 const invokeEvent = (action) => {
   if (typeof action === 'undefined' || action === null) {
@@ -6,27 +7,43 @@ const invokeEvent = (action) => {
   }
 
   switch (action[0]) {
-  case 'scroll.up':
+  case actions.SCROLL_UP:
     scrolls.scrollUp(window, action[1] || 1);
     break;
-  case 'scroll.down':
+  case actions.SCROLL_DOWN:
     scrolls.scrollDown(window, action[1] || 1);
     break;
+  case actions.SCROLL_TOP:
+    scrolls.scrollTop(window, action[1]);
+    break;
+  case actions.SCROLL_BOTTOM:
+    scrolls.scrollBottom(window, action[1]);
+    break;
   }
 }
 
+const isModifier = (code) => {
+  return code === KeyboardEvent.DOM_VK_SHIFT ||
+    code === KeyboardEvent.DOM_VK_ALT ||
+    code === KeyboardEvent.DOM_VK_CONTROL ||
+    code === KeyboardEvent.DOM_VK_META;
+}
+
 window.addEventListener("keydown", (e) => {
   if (e.target instanceof HTMLInputElement) {
     return;
   }
+  if (isModifier(e.keyCode)) {
+    return;
+  }
 
   let request = {
     type: 'event.keydown',
     code: e.keyCode,
-    shift: e.shift,
-    alt: e.alt,
-    meta: e.meta,
-    ctrl: e.ctrl,
+    shift: e.shiftKey,
+    alt: e.altKey,
+    meta: e.metaKey,
+    ctrl: e.ctrlKey,
   }
 
   browser.runtime.sendMessage(request)
diff --git a/src/content/scrolls.js b/src/content/scrolls.js
index e640384..2a233c2 100644
--- a/src/content/scrolls.js
+++ b/src/content/scrolls.js
@@ -2,26 +2,26 @@ const SCROLL_DELTA = 48;
 
 const scrollUp = (page, count) => {
   let x = page.scrollX;
-  var y = page.scrollY - SCROLL_DELTA * count;
+  let y = page.scrollY - SCROLL_DELTA * count;
   page.scrollTo(x, y);
 };
 
 const scrollDown = (page, count) => {
   let x = page.scrollX;
-  var y = page.scrollY + SCROLL_DELTA * count;
+  let y = page.scrollY + SCROLL_DELTA * count;
   page.scrollTo(x, y);
 };
 
-const scrollToTop = (page) => {
+const scrollTop = (page) => {
   let x = page.scrollX;
-  var y = page.scrollMaxY;
+  let y = 0;
   page.scrollTo(x, y);
 };
 
-const scrollToBottom = (page) => {
+const scrollBottom = (page) => {
   let x = page.scrollX;
-  var y = 0;
+  let y = page.scrollMaxY;
   page.scrollTo(x, y);
 };
 
-export { scrollUp, scrollDown, scrollToTop, scrollToBottom }
+export { scrollUp, scrollDown, scrollTop, scrollBottom }
diff --git a/src/shared/actions.js b/src/shared/actions.js
index 2e10810..3e3cbd0 100644
--- a/src/shared/actions.js
+++ b/src/shared/actions.js
@@ -2,6 +2,8 @@ export const TABS_PREV = 'tabs.prev';
 export const TABS_NEXT = 'tabs.next';
 export const SCROLL_UP = 'scroll.up';
 export const SCROLL_DOWN = 'scroll.down';
+export const SCROLL_TOP = 'scroll.top';
+export const SCROLL_BOTTOM = 'scroll.bottom';
 
 const BACKGROUND_ACTION_SET = new Set([
   TABS_PREV,
@@ -10,7 +12,9 @@ const BACKGROUND_ACTION_SET = new Set([
 
 const CONTENT_ACTION_SET = new Set([
   SCROLL_UP,
-  SCROLL_DOWN
+  SCROLL_DOWN,
+  SCROLL_TOP,
+  SCROLL_BOTTOM
 ]);
 
 export const isBackgroundAction = (action) => {
-- 
cgit v1.2.3