diff options
author | toasted-nutbread <toasted-nutbread@users.noreply.github.com> | 2019-10-12 14:20:54 -0400 |
---|---|---|
committer | toasted-nutbread <toasted-nutbread@users.noreply.github.com> | 2019-10-12 15:31:29 -0400 |
commit | 3e249e19ac5f5650553c6303b87adfdb2a688536 (patch) | |
tree | 113c5ac6cc03395cd0b4631fe7984902dd439bff /ext/fg/js | |
parent | 89a8494208d12b04c75724d2ea885adfa87349ef (diff) |
Update Display initialization process
Diffstat (limited to 'ext/fg/js')
-rw-r--r-- | ext/fg/js/float.js | 8 | ||||
-rw-r--r-- | ext/fg/js/popup.js | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/ext/fg/js/float.js b/ext/fg/js/float.js index 533d98e1..d9b483d7 100644 --- a/ext/fg/js/float.js +++ b/ext/fg/js/float.js @@ -84,6 +84,10 @@ class DisplayFloat extends Display { super.onKeyDown(e); } + getOptionsContext() { + return this.optionsContext; + } + autoPlayAudio() { this.clearAutoPlayTimer(); this.autoPlayAudioTimer = window.setTimeout(() => super.autoPlayAudio(), 400); @@ -96,7 +100,9 @@ class DisplayFloat extends Display { } } - initialize(options, popupInfo, url, childrenSupported) { + async initialize(options, popupInfo, url, childrenSupported) { + await super.initialize(options); + const css = options.general.customPopupCss; if (css) { this.setStyle(css); diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js index 7f96fe97..0fd6a9d0 100644 --- a/ext/fg/js/popup.js +++ b/ext/fg/js/popup.js @@ -61,11 +61,7 @@ class Popup { const parentFrameId = (typeof this.frameId === 'number' ? this.frameId : null); this.container.addEventListener('load', () => { this.invokeApi('initialize', { - options: { - general: { - customPopupCss: options.general.customPopupCss - } - }, + options: options, popupInfo: { id: this.id, depth: this.depth, |