aboutsummaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorsiikamiika <siikamiika@users.noreply.github.com>2020-02-13 01:59:26 +0200
committersiikamiika <siikamiika@users.noreply.github.com>2020-02-13 01:59:26 +0200
commitdf37acd17f9459c17185552f11dc4cc424e01958 (patch)
tree4d427883d97bb3d95cc42d17f780825b6b7c692f /ext
parent93eaee9765c7478ee5ad7485d664b86acf3d4510 (diff)
rename display initialize methods to prepare
Diffstat (limited to 'ext')
-rw-r--r--ext/bg/js/search.js2
-rw-r--r--ext/fg/js/float.js30
-rw-r--r--ext/mixed/js/display.js24
3 files changed, 28 insertions, 28 deletions
diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js
index 6641255f..86ed675a 100644
--- a/ext/bg/js/search.js
+++ b/ext/bg/js/search.js
@@ -47,7 +47,7 @@ class DisplaySearch extends Display {
async prepare() {
try {
- await this.initialize();
+ await super.prepare();
await this.queryParser.prepare();
diff --git a/ext/fg/js/float.js b/ext/fg/js/float.js
index 8d61d8f6..3766d5a4 100644
--- a/ext/fg/js/float.js
+++ b/ext/fg/js/float.js
@@ -33,6 +33,20 @@ class DisplayFloat extends Display {
window.addEventListener('message', (e) => this.onMessage(e), false);
}
+ async prepare(options, popupInfo, url, childrenSupported, scale) {
+ await super.prepare(options);
+
+ const {id, depth, parentFrameId} = popupInfo;
+ this.optionsContext.depth = depth;
+ this.optionsContext.url = url;
+
+ if (childrenSupported) {
+ popupNestedInitialize(id, depth, parentFrameId, url);
+ }
+
+ this.setContentScale(scale);
+ }
+
onError(error) {
if (this._orphaned) {
this.setContent('orphaned');
@@ -92,20 +106,6 @@ class DisplayFloat extends Display {
setContentScale(scale) {
document.body.style.fontSize = `${scale}em`;
}
-
- async initialize(options, popupInfo, url, childrenSupported, scale) {
- await super.initialize(options);
-
- const {id, depth, parentFrameId} = popupInfo;
- this.optionsContext.depth = depth;
- this.optionsContext.url = url;
-
- if (childrenSupported) {
- popupNestedInitialize(id, depth, parentFrameId, url);
- }
-
- this.setContentScale(scale);
- }
}
DisplayFloat._onKeyDownHandlers = new Map([
@@ -122,7 +122,7 @@ DisplayFloat._messageHandlers = new Map([
['setContent', (self, {type, details}) => self.setContent(type, details)],
['clearAutoPlayTimer', (self) => self.clearAutoPlayTimer()],
['setCustomCss', (self, {css}) => self.setCustomCss(css)],
- ['initialize', (self, {options, popupInfo, url, childrenSupported, scale}) => self.initialize(options, popupInfo, url, childrenSupported, scale)],
+ ['initialize', (self, {options, popupInfo, url, childrenSupported, scale}) => self.prepare(options, popupInfo, url, childrenSupported, scale)],
['setContentScale', (self, {scale}) => self.setContentScale(scale)]
]);
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index cee63d9b..8dea625d 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -43,6 +43,16 @@ class Display {
this.setInteractive(true);
}
+ async prepare(options=null) {
+ await this.displayGenerator.prepare();
+ await this.updateOptions(options);
+ yomichan.on('optionsUpdate', () => this.updateOptions(null));
+ }
+
+ isPrepared() {
+ return this.options !== null;
+ }
+
onError(_error) {
throw new Error('Override me');
}
@@ -238,16 +248,6 @@ class Display {
throw new Error('Override me');
}
- isInitialized() {
- return this.options !== null;
- }
-
- async initialize(options=null) {
- await this.displayGenerator.prepare();
- await this.updateOptions(options);
- yomichan.on('optionsUpdate', () => this.updateOptions(null));
- }
-
async updateOptions(options) {
this.options = options ? options : await apiOptionsGet(this.getOptionsContext());
this.updateDocumentOptions(this.options);
@@ -358,7 +358,7 @@ class Display {
async setContentTerms(definitions, context, token) {
if (!context) { throw new Error('Context expected'); }
- if (!this.isInitialized()) { return; }
+ if (!this.isPrepared()) { return; }
this.setEventListenersActive(false);
@@ -419,7 +419,7 @@ class Display {
async setContentKanji(definitions, context, token) {
if (!context) { throw new Error('Context expected'); }
- if (!this.isInitialized()) { return; }
+ if (!this.isPrepared()) { return; }
this.setEventListenersActive(false);