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

console command actions without store

Browse source
This commit is contained in:
Shin'ya Ueoka 2017-10-06 23:03:28 +09:00
parent 32168a94e0
commit 10ad62e606
5 changed files with 12 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/components/background.js
View file

@ -1,9 +1,9 @@
import messages from 'content/messages';
import * as commandActions from 'actions/command';
import * as consoleActions from 'actions/console';
import * as inputActions from 'actions/input';
import * as settingsActions from 'actions/setting';
import * as tabActions from 'actions/tab';
import * as commands from 'shared/commands';
export default class BackgroundComponent {
constructor(store) {
@ -12,7 +12,7 @@ export default class BackgroundComponent {
browser.runtime.onMessage.addListener((message, sender) => {
try {
this.onMessage(message, sender);
return this.onMessage(message, sender);
} catch (e) {
this.store.dispatch(consoleActions.showError(e.message), sender);
}
@ -47,11 +47,9 @@ export default class BackgroundComponent {
return this.store.dispatch(
consoleActions.hide(), sender);
case messages.CONSOLE_ENTERED:
return this.store.dispatch(
commandActions.exec(message.text, this.settings), sender);
case messages.CONSOLE_CHANGEED:
return this.store.dispatch(
commandActions.complete(message.text, this.settings), sender);
return commands.exec(message.text, this.settings);
case messages.CONSOLE_QUERY_COMPLETIONS:
return commands.complete(message.text, this.settings);
case messages.SETTINGS_RELOAD:
this.store.dispatch(settingsActions.load());
}

6
src/components/console.js
View file

@ -36,7 +36,7 @@ export default class ConsoleComponent {
return browser.runtime.sendMessage({
type: messages.CONSOLE_ENTERED,
text: e.target.value
});
}).then(this.onBlur);
case KeyboardEvent.DOM_VK_TAB:
if (e.shiftKey) {
this.store.dispatch(completionActions.selectPrev());
@ -63,8 +63,10 @@ export default class ConsoleComponent {
this.prevValue = e.target.value;
return browser.runtime.sendMessage({
type: messages.CONSOLE_CHANGEED,
type: messages.CONSOLE_QUERY_COMPLETIONS,
text: e.target.value
}).then((completions) => {
this.store.dispatch(completionActions.setItems(completions));
});
}