alex/yomichan
1
Fork 0
Code Releases Activity

Add _isInjectedAndLoaded property

Browse Source
This commit is contained in:
toasted-nutbread 2019-12-23 16:13:41 -05:00
parent f725549330
commit e51fd8ea71
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,7 @@ class Popup {
this._childrenSupported = true; this._childrenSupported = true;
this._injectPromise = null; this._injectPromise = null;
this._isInjected = false; this._isInjected = false;
this._isInjectedAndLoaded = false;
this._visible = false; this._visible = false;
this._visibleOverride = null; this._visibleOverride = null;
this._options = null; this._options = null;
@ -114,7 +115,7 @@ class Popup {
} }
clearAutoPlayTimer() { clearAutoPlayTimer() {
if (this._isInjected) { if (this._isInjectedAndLoaded) {
this._invokeApi('clearAutoPlayTimer'); this._invokeApi('clearAutoPlayTimer');
} }
} }
@ -215,6 +216,7 @@ class Popup {
return new Promise((resolve) => { return new Promise((resolve) => {
const parentFrameId = (typeof this._frameId === 'number' ? this._frameId : null); const parentFrameId = (typeof this._frameId === 'number' ? this._frameId : null);
this._container.addEventListener('load', () => { this._container.addEventListener('load', () => {
this._isInjectedAndLoaded = true;
this._invokeApi('initialize', { this._invokeApi('initialize', {
options: this._options, options: this._options,
popupInfo: { popupInfo: {
@ -307,6 +309,9 @@ class Popup {
} }
_invokeApi(action, params={}) { _invokeApi(action, params={}) {
if (!this._isInjectedAndLoaded) {
throw new Error('Frame not loaded');
}
this._container.contentWindow.postMessage({action, params}, '*'); this._container.contentWindow.postMessage({action, params}, '*');
} }