alex/yomichan
1
Fork 0
Code Releases Activity

Fix outer CSS being incorrectly injected (#1075)

Browse Source
This commit is contained in:
toasted-nutbread 2020-11-29 12:00:41 -05:00 committed by GitHub
parent 008ffdb6bf
commit a8cd03cbec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/bg/js/settings/popup-preview-frame.js
View File

@ -105,8 +105,8 @@ class PopupPreviewFrame {
return options; return options;
} }
_onCustomOuterCssChanged({node}) { _onCustomOuterCssChanged({node, inShadow}) {
if (node === null) { return; } if (node === null || inShadow) { return; }
const node2 = document.querySelector('#popup-outer-css'); const node2 = document.querySelector('#popup-outer-css');
if (node2 === null) { return; } if (node2 === null) { return; }

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

@ -195,12 +195,13 @@ class Popup extends EventDispatcher {
async setCustomOuterCss(css, useWebExtensionApi) { async setCustomOuterCss(css, useWebExtensionApi) {
let parentNode = null; let parentNode = null;
if (this._shadow !== null) { const inShadow = (this._shadow !== null);
if (inShadow) {
useWebExtensionApi = false; useWebExtensionApi = false;
parentNode = this._shadow; parentNode = this._shadow;
} }
const node = await dynamicLoader.loadStyle('yomichan-popup-outer-user-stylesheet', 'code', css, useWebExtensionApi, parentNode); const node = await dynamicLoader.loadStyle('yomichan-popup-outer-user-stylesheet', 'code', css, useWebExtensionApi, parentNode);
this.trigger('customOuterCssChanged', {node, useWebExtensionApi}); this.trigger('customOuterCssChanged', {node, useWebExtensionApi, inShadow});
} }
getFrameRect() { getFrameRect() {