aboutsummaryrefslogtreecommitdiff
path: root/src/content
diff options
context:
space:
mode:
authorShin'ya Ueoka <ueokande@i-beam.org>2017-10-07 18:38:57 +0900
committerShin'ya Ueoka <ueokande@i-beam.org>2017-10-07 18:50:43 +0900
commit8ff302a1f2870994cddc36fd461879eac951203d (patch)
tree3a07b64768937516dc7d43958b77dfcf77856126 /src/content
parenta6b197ca73a6be50c5c5bf391391c9971ff8c5e2 (diff)
store input keys in content script
Diffstat (limited to 'src/content')
-rw-r--r--src/content/index.js42
-rw-r--r--src/content/messages.js4
2 files changed, 3 insertions, 43 deletions
diff --git a/src/content/index.js b/src/content/index.js
index cd1a0af..09143b0 100644
--- a/src/content/index.js
+++ b/src/content/index.js
@@ -1,70 +1,32 @@
import './console-frame.scss';
import * as consoleFrames from './console-frames';
-import * as scrolls from 'content/scrolls';
-import * as navigates from 'content/navigates';
import * as settingActions from 'actions/setting';
-import * as followActions from 'actions/follow';
import { createStore } from 'store';
import ContentInputComponent from 'components/content-input';
import FollowComponent from 'components/follow';
import reducers from 'reducers';
-import operations from 'shared/operations';
import messages from './messages';
const store = createStore(reducers);
const followComponent = new FollowComponent(window.document.body, store);
+const contentInputComponent = new ContentInputComponent(window, store);
store.subscribe(() => {
try {
followComponent.update();
+ contentInputComponent.update();
} catch (e) {
console.error(e);
}
});
-// eslint-disable-next-line no-unused-vars
-const contentInputComponent = new ContentInputComponent(window);
consoleFrames.initialize(window.document);
-const execOperation = (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 store.dispatch(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);
- }
-};
-
browser.runtime.onMessage.addListener((action) => {
switch (action.type) {
case messages.CONSOLE_HIDE:
window.focus();
consoleFrames.blur(window.document);
return Promise.resolve();
- case messages.CONTENT_OPERATION:
- execOperation(action.operation);
- return Promise.resolve();
case messages.CONTENT_SET_SETTINGS:
store.dispatch(settingActions.set(action.settings));
return Promise.resolve();
diff --git a/src/content/messages.js b/src/content/messages.js
index 8d416c7..eb056a7 100644
--- a/src/content/messages.js
+++ b/src/content/messages.js
@@ -1,6 +1,6 @@
export default {
- CONTENT_OPERATION: 'content.operation',
CONTENT_SET_SETTINGS: 'content.set.settings',
+ BACKGROUND_OPERATION: 'background.operation',
CONSOLE_BLURRED: 'console.blured',
CONSOLE_ENTERED: 'console.entered',
@@ -9,8 +9,6 @@ export default {
CONSOLE_SHOW_ERROR: 'console.show.error',
CONSOLE_HIDE: 'console.hide',
- KEYDOWN: 'keydown',
-
OPEN_URL: 'open.url',
SETTINGS_RELOAD: 'settings.reload',