aboutsummaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
Diffstat (limited to 'ext')
-rw-r--r--ext/bg/js/search.js6
-rw-r--r--ext/mixed/js/display.js5
2 files changed, 6 insertions, 5 deletions
diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js
index 86ed675a..bb27205c 100644
--- a/ext/bg/js/search.js
+++ b/ext/bg/js/search.js
@@ -47,9 +47,9 @@ class DisplaySearch extends Display {
async prepare() {
try {
- await super.prepare();
-
- await this.queryParser.prepare();
+ const superPromise = super.prepare();
+ const queryParserPromise = this.queryParser.prepare();
+ await Promise.all([superPromise, queryParserPromise]);
const {queryParams: {query='', mode=''}} = parseUrl(window.location.href);
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index b524fe34..d49c205e 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -44,8 +44,9 @@ class Display {
}
async prepare(options=null) {
- await this.displayGenerator.prepare();
- await this.updateOptions(options);
+ const displayGeneratorPromise = this.displayGenerator.prepare();
+ const updateOptionsPromise = this.updateOptions(options);
+ await Promise.all([displayGeneratorPromise, updateOptionsPromise]);
yomichan.on('optionsUpdate', () => this.updateOptions(null));
}