1 files changed, 9 insertions, 84 deletions

diff --git a/src/pages/console.js b/src/pages/console.js
index 1e1b3fd..feaf725 100644
--- a/src/pages/console.js
+++ b/src/pages/console.js
@@ -1,114 +1,39 @@
 import './console.scss';
 import messages from '../content/messages';
 import CompletionComponent from '../components/completion';
+import ConsoleComponent from '../components/console';
 import completionReducer from '../reducers/completion';
 import * as store from '../store';
 import * as completionActions from '../actions/completion';
 
 const completionStore = store.createStore(completionReducer);
 let completionComponent = null;
+let consoleComponent = null;
 
 window.addEventListener('load', () => {
   let wrapper = document.querySelector('#vimvixen-console-completion');
   completionComponent = new CompletionComponent(wrapper, completionStore);
-});
 
-// TODO consider object-oriented
-let prevValue = '';
-let completionOrigin = '';
-let prevState = {};
+  // TODO use root root store instead of completionStore
+  consoleComponent = new ConsoleComponent(document.body, completionStore);
+});
 
 completionStore.subscribe(() => {
   completionComponent.update();
 
   let state = completionStore.getState();
-  let input = window.document.querySelector('#vimvixen-console-command-input');
-
   if (state.groupSelection >= 0) {
     let item = state.groups[state.groupSelection].items[state.itemSelection];
-    input.value = item.content;
+    consoleComponent.setCommandValue(item.content);
   } else if (state.groups.length > 0) {
-    input.value = completionOrigin;
-  }
-});
-
-const handleBlur = () => {
-  return browser.runtime.sendMessage({
-    type: messages.CONSOLE_BLURRED,
-  });
-};
-
-const handleKeydown = (e) => {
-  let input = window.document.querySelector('#vimvixen-console-command-input');
-
-  switch (e.keyCode) {
-  case KeyboardEvent.DOM_VK_ESCAPE:
-    return input.blur();
-  case KeyboardEvent.DOM_VK_RETURN:
-    return browser.runtime.sendMessage({
-      type: messages.CONSOLE_ENTERED,
-      text: e.target.value
-    });
-  case KeyboardEvent.DOM_VK_TAB:
-    if (e.shiftKey) {
-      completionStore.dispatch(completionActions.selectPrev());
-    } else {
-      completionStore.dispatch(completionActions.selectNext());
-    }
-    e.stopPropagation();
-    e.preventDefault();
-    break;
-  }
-};
-
-const handleKeyup = (e) => {
-  if (e.keyCode === KeyboardEvent.DOM_VK_TAB) {
-    return;
-  }
-  if (e.target.value === prevValue) {
-    return;
+    consoleComponent.setCommandCompletionOrigin();
   }
-
-  let input = window.document.querySelector('#vimvixen-console-command-input');
-  completionOrigin = input.value;
-
-  prevValue = e.target.value;
-  return browser.runtime.sendMessage({
-    type: messages.CONSOLE_CHANGEED,
-    text: e.target.value
-  });
-};
-
-window.addEventListener('load', () => {
-  let input = window.document.querySelector('#vimvixen-console-command-input');
-  input.addEventListener('blur', handleBlur);
-  input.addEventListener('keydown', handleKeydown);
-  input.addEventListener('keyup', handleKeyup);
 });
 
-const updateCompletions = (completions) => {
-  completionStore.dispatch(completionActions.setItems(completions));
-};
-
 const update = (state) => {
-  let error = window.document.querySelector('#vimvixen-console-error');
-  let command = window.document.querySelector('#vimvixen-console-command');
-  let input = window.document.querySelector('#vimvixen-console-command-input');
-
-  error.style.display = state.errorShown ? 'block' : 'none';
-  error.textContent = state.errorText;
-
-  command.style.display = state.commandShown ? 'block' : 'none';
-  if (state.commandShown && !prevState.commandShown) {
-    input.value = state.commandText;
-    input.focus();
-  }
-  if (JSON.stringify(state.completions) !==
-    JSON.stringify(prevState.completions)) {
-    updateCompletions(state.completions);
-  }
+  consoleComponent.update(state);
 
-  prevState = state;
+  completionStore.dispatch(completionActions.setItems(state.completions));
 };
 
 browser.runtime.onMessage.addListener((action) => {