diff options
| author | Shin'ya Ueoka <ueokande@i-beam.org> | 2017-10-08 15:19:25 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-08 15:19:25 +0900 |
| commit | 0183161145d36cbafb7dbd86ca3a1aac6faca43f (patch) | |
| tree | aed757bfb5f8789156439d1e1fdff4e221376aaa /src/actions | |
| parent | 0f54a203dba38acdd080a928cee95f875fe84706 (diff) | |
| parent | 57f798044d32ba7f9dc10a34ac31ad5dbdbf56ae (diff) | |
Merge pull request #22 from ueokande/separate-domains
Refactor: Separate domains
Diffstat (limited to 'src/actions')
| -rw-r--r-- | src/actions/console.js | 44 | ||||
| -rw-r--r-- | src/actions/follow.js | 29 | ||||
| -rw-r--r-- | src/actions/index.js | 28 | ||||
| -rw-r--r-- | src/actions/input.js | 23 | ||||
| -rw-r--r-- | src/actions/operation.js | 91 | ||||
| -rw-r--r-- | src/actions/setting.js | 31 | ||||
| -rw-r--r-- | src/actions/tab.js | 9 |
7 files changed, 0 insertions, 255 deletions
diff --git a/src/actions/console.js b/src/actions/console.js deleted file mode 100644 index 4183489..0000000 --- a/src/actions/console.js +++ /dev/null @@ -1,44 +0,0 @@ -import actions from 'actions'; - -const showCommand = (text) => { - return { - type: actions.CONSOLE_SHOW_COMMAND, - text: text - }; -}; - -const showError = (text) => { - return { - type: actions.CONSOLE_SHOW_ERROR, - text: text - }; -}; - -const hide = () => { - return { - type: actions.CONSOLE_HIDE - }; -}; - -const setCompletions = (completions) => { - return { - type: actions.CONSOLE_SET_COMPLETIONS, - completions: completions - }; -}; - -const completionNext = () => { - return { - type: actions.CONSOLE_COMPLETION_NEXT, - }; -}; - -const completionPrev = () => { - return { - type: actions.CONSOLE_COMPLETION_PREV, - }; -}; - -export { - showCommand, showError, hide, setCompletions, completionNext, completionPrev -}; diff --git a/src/actions/follow.js b/src/actions/follow.js deleted file mode 100644 index 708cd95..0000000 --- a/src/actions/follow.js +++ /dev/null @@ -1,29 +0,0 @@ -import actions from 'actions'; - -const enable = (newTab) => { - return { - type: actions.FOLLOW_ENABLE, - newTab, - }; -}; - -const disable = () => { - return { - type: actions.FOLLOW_DISABLE, - }; -}; - -const keyPress = (key) => { - return { - type: actions.FOLLOW_KEY_PRESS, - key: key - }; -}; - -const backspace = () => { - return { - type: actions.FOLLOW_BACKSPACE, - }; -}; - -export { enable, disable, keyPress, backspace }; diff --git a/src/actions/index.js b/src/actions/index.js deleted file mode 100644 index 6a64795..0000000 --- a/src/actions/index.js +++ /dev/null @@ -1,28 +0,0 @@ -export default { - // console commands - CONSOLE_SHOW_COMMAND: 'console.show.command', - CONSOLE_SET_COMPLETIONS: 'console.set.completions', - CONSOLE_SHOW_ERROR: 'console.show.error', - CONSOLE_HIDE: 'console.hide', - CONSOLE_COMPLETION_NEXT: 'console.completion.next', - CONSOLE_COMPLETION_PREV: 'console.completion.prev', - - // User input - INPUT_KEY_PRESS: 'input.key,press', - INPUT_CLEAR_KEYS: 'input.clear.keys', - INPUT_SET_KEYMAPS: 'input.set,keymaps', - - // Completion - COMPLETION_SET_ITEMS: 'completion.set.items', - COMPLETION_SELECT_NEXT: 'completions.select.next', - COMPLETION_SELECT_PREV: 'completions.select.prev', - - // Settings - SETTING_SET_SETTINGS: 'setting.set.settings', - - // Follow - FOLLOW_ENABLE: 'follow.enable', - FOLLOW_DISABLE: 'follow.disable', - FOLLOW_KEY_PRESS: 'follow.key.press', - FOLLOW_BACKSPACE: 'follow.backspace', -}; diff --git a/src/actions/input.js b/src/actions/input.js deleted file mode 100644 index 61acb76..0000000 --- a/src/actions/input.js +++ /dev/null @@ -1,23 +0,0 @@ -import actions from 'actions'; - -const asKeymapChars = (key, ctrl) => { - if (ctrl) { - return '<C-' + key.toUpperCase() + '>'; - } - return key; -}; - -const keyPress = (key, ctrl) => { - return { - type: actions.INPUT_KEY_PRESS, - key: asKeymapChars(key, ctrl), - }; -}; - -const clearKeys = () => { - return { - type: actions.INPUT_CLEAR_KEYS - }; -}; - -export { keyPress, clearKeys }; diff --git a/src/actions/operation.js b/src/actions/operation.js deleted file mode 100644 index 0bb8310..0000000 --- a/src/actions/operation.js +++ /dev/null @@ -1,91 +0,0 @@ -import operations from 'shared/operations'; -import messages from 'content/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: - return scrolls.scrollLines(window, operation.count); - case operations.SCROLL_PAGES: - return scrolls.scrollPages(window, operation.count); - case operations.SCROLL_TOP: - return scrolls.scrollTop(window); - case operations.SCROLL_BOTTOM: - return scrolls.scrollBottom(window); - case operations.SCROLL_HOME: - return scrolls.scrollLeft(window); - case operations.SCROLL_END: - return scrolls.scrollRight(window); - case operations.FOLLOW_START: - return followActions.enable(false); - case operations.NAVIGATE_HISTORY_PREV: - return navigates.historyPrev(window); - case operations.NAVIGATE_HISTORY_NEXT: - return navigates.historyNext(window); - case operations.NAVIGATE_LINK_PREV: - return navigates.linkPrev(window); - case operations.NAVIGATE_LINK_NEXT: - return navigates.linkNext(window); - case operations.NAVIGATE_PARENT: - return navigates.parent(window); - case operations.NAVIGATE_ROOT: - return navigates.root(window); - default: - browser.runtime.sendMessage({ - type: messages.BACKGROUND_OPERATION, - 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 }; diff --git a/src/actions/setting.js b/src/actions/setting.js deleted file mode 100644 index 2a47608..0000000 --- a/src/actions/setting.js +++ /dev/null @@ -1,31 +0,0 @@ -import actions from 'actions'; -import messages from 'content/messages'; -import DefaultSettings from 'shared/default-settings'; - -const load = () => { - return browser.storage.local.get('settings').then((value) => { - if (value.settings) { - return set(value.settings); - } - return set(DefaultSettings); - }, console.error); -}; - -const save = (settings) => { - return browser.storage.local.set({ - settings - }).then(() => { - return browser.runtime.sendMessage({ - type: messages.SETTINGS_RELOAD - }); - }); -}; - -const set = (settings) => { - return { - type: actions.SETTING_SET_SETTINGS, - settings, - }; -}; - -export { load, save, set }; 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 }; |
