Fix error on keyword not found

This commit is contained in:
Shin'ya Ueoka 2018-07-28 22:51:58 +09:00
parent ed2bd7d75e
commit f914d76ce8
4 changed files with 11 additions and 7 deletions

View file

@ -19,7 +19,11 @@ export default class ContentMessageListener {
run() {
browser.runtime.onMessage.addListener((message, sender) => {
try {
return this.onMessage(message, sender).catch((e) => {
let ret = this.onMessage(message, sender);
if (!(ret instanceof Promise)) {
return {};
}
return ret.catch((e) => {
return browser.tabs.sendMessage(sender.tab.id, {
type: messages.CONSOLE_SHOW_ERROR,
text: e.message,

View file

@ -12,7 +12,8 @@ export default class FindRepository {
}
setKeyword(keyword) {
return this.cache.set(FIND_KEYWORD_KEY, keyword);
this.cache.set(FIND_KEYWORD_KEY, keyword);
return Promise.resolve();
}
}

View file

@ -8,8 +8,7 @@ export default class LinkInteractor {
}
openToTab(url, tabId) {
this.tabPresenter.open(url, tabId);
return this.tabPresenter.open(url, tabId);
}
async openNewTab(url, openerId, background) {

View file

@ -126,7 +126,7 @@ export default class OperationInteractor {
async showCommand() {
let tab = await this.tabPresenter.getCurrent();
this.consolePresenter.showCommand(tab.id, '');
return this.consolePresenter.showCommand(tab.id, '');
}
async showOpenCommand(alter) {
@ -173,12 +173,12 @@ export default class OperationInteractor {
async findStart() {
let tab = await this.tabPresenter.getCurrent();
this.consolePresenter.showFind(tab.id);
return this.consolePresenter.showFind(tab.id);
}
async hideConsole() {
let tab = await this.tabPresenter.getCurrent();
this.consolePresenter.hide(tab.id);
return this.consolePresenter.hide(tab.id);
}
onTabSelected(tabId) {