Use async/await on content script
This commit is contained in:
parent
48e4bccf0d
commit
7f56a08f3b
3 changed files with 32 additions and 34 deletions
|
@ -107,16 +107,15 @@ export default class ConsoleComponent {
|
|||
}
|
||||
}
|
||||
|
||||
onInput(e) {
|
||||
async onInput(e) {
|
||||
this.store.dispatch(consoleActions.setConsoleText(e.target.value));
|
||||
|
||||
let source = e.target.value;
|
||||
return browser.runtime.sendMessage({
|
||||
let completions = await browser.runtime.sendMessage({
|
||||
type: messages.CONSOLE_QUERY_COMPLETIONS,
|
||||
text: source,
|
||||
}).then((completions) => {
|
||||
this.store.dispatch(consoleActions.setCompletions(source, completions));
|
||||
});
|
||||
this.store.dispatch(consoleActions.setCompletions(source, completions));
|
||||
}
|
||||
|
||||
onInputShown(state) {
|
||||
|
|
|
@ -35,47 +35,45 @@ const find = (string, backwards) => {
|
|||
|
||||
// NOTE: aWholeWord dows not implemented, and aSearchInFrames does not work
|
||||
// because of same origin policy
|
||||
let found = window.find(string, caseSensitive, backwards, wrapScan);
|
||||
if (found) {
|
||||
return found;
|
||||
}
|
||||
window.getSelection().removeAllRanges();
|
||||
return window.find(string, caseSensitive, backwards, wrapScan);
|
||||
};
|
||||
|
||||
const findNext = (currentKeyword, reset, backwards) => {
|
||||
const findNext = async(currentKeyword, reset, backwards) => {
|
||||
if (reset) {
|
||||
window.getSelection().removeAllRanges();
|
||||
}
|
||||
|
||||
let promise = Promise.resolve(currentKeyword);
|
||||
let keyword = currentKeyword;
|
||||
if (currentKeyword) {
|
||||
browser.runtime.sendMessage({
|
||||
type: messages.FIND_SET_KEYWORD,
|
||||
keyword: currentKeyword,
|
||||
});
|
||||
} else {
|
||||
promise = browser.runtime.sendMessage({
|
||||
keyword = await browser.runtime.sendMessage({
|
||||
type: messages.FIND_GET_KEYWORD,
|
||||
});
|
||||
}
|
||||
if (!keyword) {
|
||||
return postNoPrevious();
|
||||
}
|
||||
let found = find(keyword, backwards);
|
||||
if (found) {
|
||||
postPatternFound(keyword);
|
||||
} else {
|
||||
postPatternNotFound(keyword);
|
||||
}
|
||||
|
||||
return promise.then((keyword) => {
|
||||
if (!keyword) {
|
||||
return postNoPrevious();
|
||||
}
|
||||
let found = find(keyword, backwards);
|
||||
if (!found) {
|
||||
window.getSelection().removeAllRanges();
|
||||
found = find(keyword, backwards);
|
||||
}
|
||||
if (found) {
|
||||
postPatternFound(keyword);
|
||||
} else {
|
||||
postPatternNotFound(keyword);
|
||||
}
|
||||
|
||||
return {
|
||||
type: actions.FIND_SET_KEYWORD,
|
||||
keyword,
|
||||
found,
|
||||
};
|
||||
});
|
||||
return {
|
||||
type: actions.FIND_SET_KEYWORD,
|
||||
keyword,
|
||||
found,
|
||||
};
|
||||
};
|
||||
|
||||
const next = (currentKeyword, reset) => {
|
||||
|
|
|
@ -44,15 +44,16 @@ export default class Common {
|
|||
}
|
||||
}
|
||||
|
||||
reloadSettings() {
|
||||
browser.runtime.sendMessage({
|
||||
type: messages.SETTINGS_QUERY,
|
||||
}).then((settings) => {
|
||||
async reloadSettings() {
|
||||
try {
|
||||
let settings = await browser.runtime.sendMessage({
|
||||
type: messages.SETTINGS_QUERY,
|
||||
});
|
||||
this.store.dispatch(settingActions.set(settings));
|
||||
}).catch((e) => {
|
||||
} catch (e) {
|
||||
// Sometime sendMessage fails when background script is not ready.
|
||||
console.warn(e);
|
||||
setTimeout(() => this.reloadSettings(), 500);
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Reference in a new issue