Merge pull request #19 from ueokande/content-and-background-redux-completely

Refactor: full redux on content and background

1 files changed, 15 insertions, 21 deletions

diff --git a/src/background/index.js b/src/background/index.js
index e968c82..b966c13 100644
--- a/src/background/index.js
+++ b/src/background/index.js
@@ -1,30 +1,24 @@
-import * as consoleActions from '../actions/console';
-import * as settingsActions from '../actions/setting';
-import BackgroundComponent from '../components/background';
-import BackgroundInputComponent from '../components/background-input';
-import reducers from '../reducers';
-import messages from '../content/messages';
-import * as store from '../store';
+import * as settingsActions from 'actions/setting';
+import messages from 'content/messages';
+import BackgroundComponent from 'components/background';
+import BackgroundInputComponent from 'components/background-input';
+import reducers from 'reducers';
+import { createStore } from 'store';
 
-const backgroundStore = store.createStore(reducers, (e, sender) => {
+const store = createStore(reducers, (e, sender) => {
   console.error('Vim-Vixen:', e);
   if (sender) {
-    backgroundStore.dispatch(consoleActions.showError(e.message), sender);
+    return browser.tabs.sendMessage(sender.tab.id, {
+      type: messages.CONSOLE_SHOW_ERROR,
+      text: e.message,
+    });
   }
 });
-const backgroundComponent = new BackgroundComponent(backgroundStore);
-const backgroundInputComponent = new BackgroundInputComponent(backgroundStore);
-backgroundStore.subscribe((sender) => {
+const backgroundComponent = new BackgroundComponent(store);
+const backgroundInputComponent = new BackgroundInputComponent(store);
+store.subscribe((sender) => {
   backgroundComponent.update(sender);
   backgroundInputComponent.update(sender);
 });
-backgroundStore.subscribe((sender) => {
-  if (sender) {
-    return browser.tabs.sendMessage(sender.tab.id, {
-      type: messages.STATE_UPDATE,
-      state: backgroundStore.getState()
-    });
-  }
-});
 
-backgroundStore.dispatch(settingsActions.load());
+store.dispatch(settingsActions.load());