jab2870/Vim-Vixen
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

move background actions to operations

Browse source
This commit is contained in:
Shin'ya Ueoka 2017-09-13 21:23:55 +09:00
parent 0ae39f1b67
commit b6e5153c1f
6 changed files with 56 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/background/index.js
View file

@ -1,9 +1,15 @@
import * as keys from './keys';
import * as inputActions from '../actions/input';
import * as operationActions from '../actions/operation';
import backgroundReducers from '../reducers/background';
import commandReducer from '../reducers/command';
import inputReducers from '../reducers/input';
import * as store from '../store'
const emptyReducer = (state, action) => state;
const emptyStore = store.createStore(emptyReducer, (e) => {
console.error('Vim-Vixen:', e);
});
let inputState = inputReducers(undefined, {});
const keyQueueChanged = (sender, prevState, state) => {
@ -21,6 +27,9 @@ const keyQueueChanged = (sender, prevState, state) => {
return Promise.resolve();
}
let action = keys.defaultKeymap[matched];
emptyStore.dispatch(operationActions.exec(action, sender), (e) => {
console.error('Vim-Vixen:', e);
});
return handleMessage(inputActions.clearKeys(), sender).then(() => {
return backgroundReducers(undefined, action, sender).then(() => {
return browser.tabs.sendMessage(sender.tab.id, action);

19
src/background/keys.js
View file

@ -1,4 +1,5 @@
import actions from '../actions';
import operations from '../operations';
const defaultKeymap = {
':': { type: actions.CMD_OPEN },
@ -17,15 +18,15 @@ const defaultKeymap = {
'G': { type: actions.SCROLL_BOTTOM },
'0': { type: actions.SCROLL_LEFT },
'$': { type: actions.SCROLL_RIGHT },
'd': { type: actions.TABS_CLOSE },
'u': { type: actions.TABS_REOPEN },
'h': { type: actions.TABS_PREV, count: 1 },
'l': { type: actions.TABS_NEXT, count: 1 },
'r': { type: actions.TABS_RELOAD, cache: false },
'R': { type: actions.TABS_RELOAD, cache: true },
'zi': { type: actions.ZOOM_IN },
'zo': { type: actions.ZOOM_OUT },
'zz': { type: actions.ZOOM_NEUTRAL },
'd': { type: operations.TABS_CLOSE },
'u': { type: operations.TABS_REOPEN },
'h': { type: operations.TABS_PREV, count: 1 },
'l': { type: operations.TABS_NEXT, count: 1 },
'r': { type: operations.TABS_RELOAD, cache: false },
'R': { type: operations.TABS_RELOAD, cache: true },
'zi': { type: operations.ZOOM_IN },
'zo': { type: operations.ZOOM_OUT },
'zz': { type: operations.ZOOM_NEUTRAL },
'f': { type: actions.FOLLOW_START, newTab: false },
'F': { type: actions.FOLLOW_START, newTab: true },
'H': { type: actions.HISTORY_PREV },