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

add setting actions in content

Browse source
This commit is contained in:
Shin'ya Ueoka 2017-10-22 17:45:16 +09:00
parent 7639e99b75
commit c6eb5553d0
10 changed files with 74 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/content/components/common/index.js
View file

@ -1,7 +1,7 @@
import InputComponent from './input';
import KeymapperComponent from './keymapper';
import FollowComponent from './follow';
import * as inputActions from 'content/actions/input';
import * as settingActions from 'content/actions/setting';
import messages from 'shared/messages';
export default class Common {
@ -40,7 +40,7 @@ export default class Common {
browser.runtime.sendMessage({
type: messages.SETTINGS_QUERY,
}).then((settings) => {
this.store.dispatch(inputActions.setKeymaps(settings.keymaps));
this.store.dispatch(settingActions.set(settings));
});
}
}

15
src/content/components/common/keymapper.js
View file

@ -11,19 +11,20 @@ export default class KeymapperComponent {
}
key(key) {
let enabled = this.store.getState().addon.enabled;
this.store.dispatch(inputActions.keyPress(key));
let input = this.store.getState().input;
let matched = Object.keys(input.keymaps).filter((keyStr) => {
let state = this.store.getState();
let input = state.input;
let keymaps = state.setting.keymaps;
let matched = Object.keys(keymaps).filter((keyStr) => {
return keyStr.startsWith(input.keys);
});
if (!enabled) {
if (!state.addon.enabled) {
// available keymaps are only ADDON_ENABLE and ADDON_TOGGLE_ENABLED if
// the addon disabled
matched = matched.filter((keys) => {
let type = input.keymaps[keys].type;
let type = keymaps[keys].type;
return type === operations.ADDON_ENABLE ||
type === operations.ADDON_TOGGLE_ENABLED;
});
@ -35,7 +36,7 @@ export default class KeymapperComponent {
matched.length === 1 && input.keys !== matched[0]) {
return true;
}
let operation = input.keymaps[matched];
let operation = keymaps[matched];
this.store.dispatch(operationActions.exec(operation));
this.store.dispatch(inputActions.clearKeys());
return true;