alex/yomichan
1
Fork 0
Code Releases Activity

Check if objects are properly initialized before showing content

Browse Source
This commit is contained in:
toasted-nutbread 2019-10-12 14:41:24 -04:00
parent 8a1637f6b3
commit a5b208fb89
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ext/fg/js/popup.js
View File

@ -79,6 +79,10 @@ class Popup {
}); });
} }
isInitialized() {
return this.options !== null;
}
async setOptions(options) { async setOptions(options) {
this.options = options; this.options = options;
} }
@ -212,6 +216,7 @@ class Popup {
} }
async showOrphaned(elementRect, writingMode, options) { async showOrphaned(elementRect, writingMode, options) {
if (!this.isInitialized()) { return; }
await this.show(elementRect, writingMode, options); await this.show(elementRect, writingMode, options);
this.invokeApi('orphaned'); this.invokeApi('orphaned');
} }
@ -275,11 +280,13 @@ class Popup {
} }
async termsShow(elementRect, writingMode, definitions, options, context) { async termsShow(elementRect, writingMode, definitions, options, context) {
if (!this.isInitialized()) { return; }
await this.show(elementRect, writingMode, options); await this.show(elementRect, writingMode, options);
this.invokeApi('termsShow', {definitions, options, context}); this.invokeApi('termsShow', {definitions, options, context});
} }
async kanjiShow(elementRect, writingMode, definitions, options, context) { async kanjiShow(elementRect, writingMode, definitions, options, context) {
if (!this.isInitialized()) { return; }
await this.show(elementRect, writingMode, options); await this.show(elementRect, writingMode, options);
this.invokeApi('kanjiShow', {definitions, options, context}); this.invokeApi('kanjiShow', {definitions, options, context});
} }

8
ext/mixed/js/display.js
View File

@ -187,6 +187,10 @@ class Display {
throw new Error('Override me'); throw new Error('Override me');
} }
isInitialized() {
return this.options !== null;
}
async initialize(options=null) { async initialize(options=null) {
await this.updateOptions(options); await this.updateOptions(options);
chrome.runtime.onMessage.addListener(this.onRuntimeMessage.bind(this)); chrome.runtime.onMessage.addListener(this.onRuntimeMessage.bind(this));
@ -236,6 +240,8 @@ class Display {
} }
async termsShow(definitions, options, context) { async termsShow(definitions, options, context) {
if (!this.isInitialized()) { return; }
try { try {
this.setEventListenersActive(false); this.setEventListenersActive(false);
@ -287,6 +293,8 @@ class Display {
} }
async kanjiShow(definitions, options, context) { async kanjiShow(definitions, options, context) {
if (!this.isInitialized()) { return; }
try { try {
this.setEventListenersActive(false); this.setEventListenersActive(false);