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/content/index.js   | 29 +++++++++++++++++------------
 src/content/scrolls.js |  8 ++++----
 2 files changed, 21 insertions(+), 16 deletions(-)

(limited to 'src/content')

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);
 };
 
-- 
cgit v1.2.3