From d886d7de290b6fee00c55c5487416048f3de4bf2 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sun, 8 Oct 2017 14:57:27 +0900 Subject: move background --- src/actions/operation.js | 50 +-------------------- src/actions/tab.js | 9 ---- src/background/actions/index.js | 0 src/background/actions/operation.js | 52 ++++++++++++++++++++++ src/background/actions/tab.js | 9 ++++ src/background/components/background.js | 79 +++++++++++++++++++++++++++++++++ src/background/index.js | 4 +- src/components/background.js | 79 --------------------------------- 8 files changed, 143 insertions(+), 139 deletions(-) delete mode 100644 src/actions/tab.js create mode 100644 src/background/actions/index.js create mode 100644 src/background/actions/operation.js create mode 100644 src/background/actions/tab.js create mode 100644 src/background/components/background.js delete mode 100644 src/components/background.js (limited to 'src') diff --git a/src/actions/operation.js b/src/actions/operation.js index 8b1590b..a27cd02 100644 --- a/src/actions/operation.js +++ b/src/actions/operation.js @@ -1,18 +1,9 @@ import operations from 'shared/operations'; import messages from 'shared/messages'; -import * as tabs from 'background/tabs'; -import * as zooms from 'background/zooms'; import * as scrolls from 'content/scrolls'; import * as navigates from 'content/navigates'; import * as followActions from 'actions/follow'; -const sendConsoleShowCommand = (tab, command) => { - return browser.tabs.sendMessage(tab.id, { - type: messages.CONSOLE_SHOW_COMMAND, - command, - }); -}; - const exec = (operation) => { switch (operation.type) { case operations.SCROLL_LINES: @@ -49,43 +40,4 @@ const exec = (operation) => { } }; -const execBackground = (operation, tab) => { - switch (operation.type) { - case operations.TAB_CLOSE: - return tabs.closeTab(tab.id); - case operations.TAB_REOPEN: - return tabs.reopenTab(); - case operations.TAB_PREV: - return tabs.selectPrevTab(tab.index, operation.count); - case operations.TAB_NEXT: - return tabs.selectNextTab(tab.index, operation.count); - case operations.TAB_RELOAD: - return tabs.reload(tab, operation.cache); - case operations.ZOOM_IN: - return zooms.zoomIn(); - case operations.ZOOM_OUT: - return zooms.zoomOut(); - case operations.ZOOM_NEUTRAL: - return zooms.neutral(); - case operations.COMMAND_SHOW: - return sendConsoleShowCommand(tab, ''); - case operations.COMMAND_SHOW_OPEN: - if (operation.alter) { - // alter url - return sendConsoleShowCommand(tab, 'open ' + tab.url); - } - return sendConsoleShowCommand(tab, 'open '); - case operations.COMMAND_SHOW_TABOPEN: - if (operation.alter) { - // alter url - return sendConsoleShowCommand(tab, 'tabopen ' + tab.url); - } - return sendConsoleShowCommand(tab, 'tabopen '); - case operations.COMMAND_SHOW_BUFFER: - return sendConsoleShowCommand(tab, 'buffer '); - default: - return Promise.resolve(); - } -}; - -export { exec, execBackground }; +export { exec }; diff --git a/src/actions/tab.js b/src/actions/tab.js deleted file mode 100644 index e512b6f..0000000 --- a/src/actions/tab.js +++ /dev/null @@ -1,9 +0,0 @@ -const openNewTab = (url) => { - return browser.tabs.create({ url: url }); -}; - -const openToTab = (url, tab) => { - return browser.tabs.update(tab.id, { url: url }); -}; - -export { openToTab, openNewTab }; diff --git a/src/background/actions/index.js b/src/background/actions/index.js new file mode 100644 index 0000000..e69de29 diff --git a/src/background/actions/operation.js b/src/background/actions/operation.js new file mode 100644 index 0000000..d736c09 --- /dev/null +++ b/src/background/actions/operation.js @@ -0,0 +1,52 @@ +import operations from 'shared/operations'; +import messages from 'shared/messages'; +import * as tabs from 'background/tabs'; +import * as zooms from 'background/zooms'; + +const sendConsoleShowCommand = (tab, command) => { + return browser.tabs.sendMessage(tab.id, { + type: messages.CONSOLE_SHOW_COMMAND, + command, + }); +}; + +const exec = (operation, tab) => { + switch (operation.type) { + case operations.TAB_CLOSE: + return tabs.closeTab(tab.id); + case operations.TAB_REOPEN: + return tabs.reopenTab(); + case operations.TAB_PREV: + return tabs.selectPrevTab(tab.index, operation.count); + case operations.TAB_NEXT: + return tabs.selectNextTab(tab.index, operation.count); + case operations.TAB_RELOAD: + return tabs.reload(tab, operation.cache); + case operations.ZOOM_IN: + return zooms.zoomIn(); + case operations.ZOOM_OUT: + return zooms.zoomOut(); + case operations.ZOOM_NEUTRAL: + return zooms.neutral(); + case operations.COMMAND_SHOW: + return sendConsoleShowCommand(tab, ''); + case operations.COMMAND_SHOW_OPEN: + if (operation.alter) { + // alter url + return sendConsoleShowCommand(tab, 'open ' + tab.url); + } + return sendConsoleShowCommand(tab, 'open '); + case operations.COMMAND_SHOW_TABOPEN: + if (operation.alter) { + // alter url + return sendConsoleShowCommand(tab, 'tabopen ' + tab.url); + } + return sendConsoleShowCommand(tab, 'tabopen '); + case operations.COMMAND_SHOW_BUFFER: + return sendConsoleShowCommand(tab, 'buffer '); + default: + return Promise.resolve(); + } +}; + +export { exec }; diff --git a/src/background/actions/tab.js b/src/background/actions/tab.js new file mode 100644 index 0000000..e512b6f --- /dev/null +++ b/src/background/actions/tab.js @@ -0,0 +1,9 @@ +const openNewTab = (url) => { + return browser.tabs.create({ url: url }); +}; + +const openToTab = (url, tab) => { + return browser.tabs.update(tab.id, { url: url }); +}; + +export { openToTab, openNewTab }; diff --git a/src/background/components/background.js b/src/background/components/background.js new file mode 100644 index 0000000..bfe1b3f --- /dev/null +++ b/src/background/components/background.js @@ -0,0 +1,79 @@ +import messages from 'shared/messages'; +import * as operationActions from 'background/actions/operation'; +import * as settingsActions from 'settings/actions/setting'; +import * as tabActions from 'background/actions/tab'; +import * as commands from 'shared/commands'; + +export default class BackgroundComponent { + constructor(store) { + this.store = store; + this.setting = {}; + + browser.runtime.onMessage.addListener((message, sender) => { + try { + return this.onMessage(message, sender); + } catch (e) { + return browser.tabs.sendMessage(sender.tab.id, { + type: messages.CONSOLE_SHOW_ERROR, + text: e.message, + }); + } + }); + } + + update() { + let state = this.store.getState(); + this.updateSettings(state); + } + + updateSettings(setting) { + if (!setting.settings.json) { + return; + } + this.settings = JSON.parse(setting.settings.json); + } + + onMessage(message, sender) { + switch (message.type) { + case messages.BACKGROUND_OPERATION: + return this.store.dispatch( + operationActions.exec(message.operation, sender.tab), + sender); + case messages.OPEN_URL: + if (message.newTab) { + return this.store.dispatch( + tabActions.openNewTab(message.url), sender); + } + return this.store.dispatch( + tabActions.openToTab(message.url, sender.tab), sender); + case messages.CONSOLE_BLURRED: + return browser.tabs.sendMessage(sender.tab.id, { + type: messages.CONSOLE_HIDE, + }); + case messages.CONSOLE_ENTERED: + return commands.exec(message.text, this.settings).catch((e) => { + return browser.tabs.sendMessage(sender.tab.id, { + type: messages.CONSOLE_SHOW_ERROR, + text: e.message, + }); + }); + case messages.SETTINGS_QUERY: + return Promise.resolve(this.store.getState().settings); + case messages.CONSOLE_QUERY_COMPLETIONS: + return commands.complete(message.text, this.settings); + case messages.SETTINGS_RELOAD: + this.store.dispatch(settingsActions.load()); + return this.broadcastSettingsChanged(); + } + } + + broadcastSettingsChanged() { + return browser.tabs.query({}).then((tabs) => { + for (let tab of tabs) { + browser.tabs.sendMessage(tab.id, { + type: messages.SETTINGS_CHANGED, + }); + } + }); + } +} diff --git a/src/background/index.js b/src/background/index.js index c51754b..587cc0b 100644 --- a/src/background/index.js +++ b/src/background/index.js @@ -1,7 +1,7 @@ import * as settingsActions from 'settings/actions/setting'; import messages from 'shared/messages'; -import BackgroundComponent from 'components/background'; -import reducers from 'reducers'; +import BackgroundComponent from 'background/components/background'; +import reducers from 'settings/reducers/setting'; import { createStore } from 'store'; const store = createStore(reducers, (e, sender) => { diff --git a/src/components/background.js b/src/components/background.js deleted file mode 100644 index 200fedf..0000000 --- a/src/components/background.js +++ /dev/null @@ -1,79 +0,0 @@ -import messages from 'shared/messages'; -import * as operationActions from 'actions/operation'; -import * as settingsActions from 'settings/actions/setting'; -import * as tabActions from 'actions/tab'; -import * as commands from 'shared/commands'; - -export default class BackgroundComponent { - constructor(store) { - this.store = store; - this.setting = {}; - - browser.runtime.onMessage.addListener((message, sender) => { - try { - return this.onMessage(message, sender); - } catch (e) { - return browser.tabs.sendMessage(sender.tab.id, { - type: messages.CONSOLE_SHOW_ERROR, - text: e.message, - }); - } - }); - } - - update() { - let state = this.store.getState(); - this.updateSettings(state.setting); - } - - updateSettings(setting) { - if (!setting.settings.json) { - return; - } - this.settings = JSON.parse(setting.settings.json); - } - - onMessage(message, sender) { - switch (message.type) { - case messages.BACKGROUND_OPERATION: - return this.store.dispatch( - operationActions.execBackground(message.operation, sender.tab), - sender); - case messages.OPEN_URL: - if (message.newTab) { - return this.store.dispatch( - tabActions.openNewTab(message.url), sender); - } - return this.store.dispatch( - tabActions.openToTab(message.url, sender.tab), sender); - case messages.CONSOLE_BLURRED: - return browser.tabs.sendMessage(sender.tab.id, { - type: messages.CONSOLE_HIDE, - }); - case messages.CONSOLE_ENTERED: - return commands.exec(message.text, this.settings).catch((e) => { - return browser.tabs.sendMessage(sender.tab.id, { - type: messages.CONSOLE_SHOW_ERROR, - text: e.message, - }); - }); - case messages.SETTINGS_QUERY: - return Promise.resolve(this.store.getState().setting.settings); - case messages.CONSOLE_QUERY_COMPLETIONS: - return commands.complete(message.text, this.settings); - case messages.SETTINGS_RELOAD: - this.store.dispatch(settingsActions.load()); - return this.broadcastSettingsChanged(); - } - } - - broadcastSettingsChanged() { - return browser.tabs.query({}).then((tabs) => { - for (let tab of tabs) { - browser.tabs.sendMessage(tab.id, { - type: messages.SETTINGS_CHANGED, - }); - } - }); - } -} -- cgit v1.2.3