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

fix console errors

Browse source
This commit is contained in:
Shin'ya Ueoka 2017-10-07 11:00:34 +09:00
parent 45368384d1
commit 9fb7bf96be
3 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/background/index.js
View file

@ -1,5 +1,5 @@
import * as consoleActions from 'actions/console';
import * as settingsActions from 'actions/setting'; import * as settingsActions from 'actions/setting';
import messages from 'content/messages';
import BackgroundComponent from 'components/background'; import BackgroundComponent from 'components/background';
import BackgroundInputComponent from 'components/background-input'; import BackgroundInputComponent from 'components/background-input';
import reducers from 'reducers'; import reducers from 'reducers';
@ -8,7 +8,10 @@ import { createStore } from 'store';
const store = createStore(reducers, (e, sender) => { const store = createStore(reducers, (e, sender) => {
console.error('Vim-Vixen:', e); console.error('Vim-Vixen:', e);
if (sender) { if (sender) {
store.dispatch(consoleActions.showError(e.message), sender); return browser.tabs.sendMessage(sender.tab.id, {
type: messages.CONSOLE_SHOW_ERROR,
text: e.message,
});
} }
}); });
const backgroundComponent = new BackgroundComponent(store); const backgroundComponent = new BackgroundComponent(store);

18
src/components/background.js
View file

@ -1,5 +1,4 @@
import messages from 'content/messages'; import messages from 'content/messages';
import * as consoleActions from 'actions/console';
import * as inputActions from 'actions/input'; import * as inputActions from 'actions/input';
import * as settingsActions from 'actions/setting'; import * as settingsActions from 'actions/setting';
import * as tabActions from 'actions/tab'; import * as tabActions from 'actions/tab';
@ -14,7 +13,10 @@ export default class BackgroundComponent {
try { try {
return this.onMessage(message, sender); return this.onMessage(message, sender);
} catch (e) { } catch (e) {
this.store.dispatch(consoleActions.showError(e.message), sender); return browser.tabs.sendMessage(sender.tab.id, {
type: messages.CONSOLE_SHOW_ERROR,
text: e.message,
});
} }
}); });
} }
@ -44,10 +46,16 @@ export default class BackgroundComponent {
return this.store.dispatch( return this.store.dispatch(
tabActions.openToTab(message.url, sender.tab), sender); tabActions.openToTab(message.url, sender.tab), sender);
case messages.CONSOLE_BLURRED: case messages.CONSOLE_BLURRED:
return this.store.dispatch( return browser.tabs.sendMessage(sender.tab.id, {
consoleActions.hide(), sender); type: messages.CONSOLE_HIDE,
});
case messages.CONSOLE_ENTERED: case messages.CONSOLE_ENTERED:
return commands.exec(message.text, this.settings); return commands.exec(message.text, this.settings).catch((e) => {
return browser.tabs.sendMessage(sender.tab.id, {
type: messages.CONSOLE_SHOW_ERROR,
text: e.message,
});
});
case messages.CONSOLE_QUERY_COMPLETIONS: case messages.CONSOLE_QUERY_COMPLETIONS:
return commands.complete(message.text, this.settings); return commands.complete(message.text, this.settings);
case messages.SETTINGS_RELOAD: case messages.SETTINGS_RELOAD:

2
src/pages/console.js
View file

@ -27,7 +27,7 @@ browser.runtime.onMessage.addListener((action) => {
case messages.CONSOLE_SHOW_COMMAND: case messages.CONSOLE_SHOW_COMMAND:
return store.dispatch(consoleActions.showCommand(action.command)); return store.dispatch(consoleActions.showCommand(action.command));
case messages.CONSOLE_SHOW_ERROR: case messages.CONSOLE_SHOW_ERROR:
return store.dispatch(consoleActions.showError(action.command)); return store.dispatch(consoleActions.showError(action.text));
case messages.CONSOLE_HIDE: case messages.CONSOLE_HIDE:
return store.dispatch(consoleActions.hide(action.command)); return store.dispatch(consoleActions.hide(action.command));
} }