2 files changed, 33 insertions, 16 deletions
diff --git a/src/components/content-input.js b/src/components/content-input.js
new file mode 100644
index 0000000..81f2e6b
--- /dev/null
+++ b/src/components/content-input.js
@@ -0,0 +1,31 @@
+import messages from '../content/messages';
+
+export default class ContentInputComponent {
+  constructor(target) {
+    target.addEventListener('keypress', this.onKeyPress.bind(this));
+    target.addEventListener('keydown', this.onKeyDown.bind(this));
+    target.addEventListener('keyup', this.onKeyUp.bind(this));
+  }
+
+  onKeyPress(e) {
+    if (e.target instanceof HTMLInputElement ||
+      e.target instanceof HTMLTextAreaElement ||
+      e.target instanceof HTMLSelectElement) {
+      if (e.key === 'Escape' && e.target.blur) {
+        e.target.blur();
+      }
+      return;
+    }
+    browser.runtime.sendMessage({
+      type: messages.KEYDOWN,
+      code: e.which,
+      ctrl: e.ctrlKey
+    });
+  }
+
+  onKeyDown() {
+  }
+
+  onKeyUp() {
+  }
+}
diff --git a/src/content/index.js b/src/content/index.js
index 0dbc8c1..e5a2965 100644
--- a/src/content/index.js
+++ b/src/content/index.js
@@ -4,6 +4,7 @@ import * as scrolls from '../content/scrolls';
 import * as navigates from '../content/navigates';
 import * as followActions from '../actions/follow';
 import * as store from '../store';
+import ContentInputComponent from '../components/content-input';
 import FollowComponent from '../components/follow';
 import followReducer from '../reducers/follow';
 import operations from '../operations';
@@ -18,25 +19,10 @@ followStore.subscribe(() => {
     console.error(e);
   }
 });
+const contentInputComponent = new ContentInputComponent(window);
 
 consoleFrames.initialize(window.document);
 
-window.addEventListener('keypress', (e) => {
-  if (e.target instanceof HTMLInputElement ||
-    e.target instanceof HTMLTextAreaElement ||
-    e.target instanceof HTMLSelectElement) {
-    if (e.key === 'Escape' && e.target.blur) {
-      e.target.blur();
-    }
-    return;
-  }
-  browser.runtime.sendMessage({
-    type: messages.KEYDOWN,
-    code: e.which,
-    ctrl: e.ctrlKey
-  });
-});
-
 const execOperation = (operation) => {
   switch (operation.type) {
   case operations.SCROLL_LINES: