alex/yomichan
1
Fork 0
Code Releases Activity

Update nested initialization parameters passed via message rather than using the URL query string

Browse Source
This commit is contained in:
toasted-nutbread 2019-08-18 21:49:55 -04:00
parent 53aad0bef6
commit 3491affcf1
4 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/fg/js/float.js
View File

@ -72,6 +72,10 @@ class DisplayFloat extends Display {
if (css) {
this.setStyle(css);
}
},
popupNestedInitialize: ({id, depth, parentFrameId}) => {
popupNestedInitialize(id, depth, parentFrameId);
}
};

20
ext/fg/js/frontend.js
View File

@ -37,23 +37,9 @@ class Frontend {
}
static create() {
const floatUrl = chrome.extension.getURL('/fg/float.html');
const currentUrl = location.href.replace(/[\?#][\w\W]*$/, "");
const isNested = (currentUrl === floatUrl);
let id = null;
let parentFrameId = null;
if (isNested) {
let match = /[&?]id=([^&]*?)(?:&|$)/.exec(location.href);
if (match !== null) {
id = match[1];
}
match = /[&?]parent=(\d+)(?:&|$)/.exec(location.href);
if (match !== null) {
parentFrameId = parseInt(match[1], 10);
}
}
const initializationData = window.frontendInitializationData;
const isNested = (initializationData !== null && typeof initializationData === 'object');
const {id, parentFrameId} = initializationData || {};
const popup = isNested ? new PopupProxy(id, parentFrameId) : PopupProxyHost.instance.createPopup(null);
const frontend = new Frontend(popup);

19
ext/fg/js/popup-nested.js
View File

@ -17,20 +17,23 @@
*/
async function popupNestedSetup() {
let popupNestedInitialized = false;
async function popupNestedInitialize(id, depth, parentFrameId) {
if (popupNestedInitialized) {
return;
}
popupNestedInitialized = true;
const options = await apiOptionsGet();
const popupNestingMaxDepth = options.scanning.popupNestingMaxDepth;
let depth = null;
const match = /[&?]depth=([^&]*?)(?:&|$)/.exec(location.href);
if (match !== null) {
depth = parseInt(match[1], 10);
}
if (!(typeof popupNestingMaxDepth === 'number' && typeof depth === 'number' && depth < popupNestingMaxDepth)) {
return;
}
window.frontendInitializationData = {id, depth, parentFrameId};
const scriptSrcs = [
'/fg/js/frontend-api-sender.js',
'/fg/js/popup.js',
@ -44,5 +47,3 @@ async function popupNestedSetup() {
document.body.appendChild(script);
}
}
popupNestedSetup();

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

@ -29,6 +29,7 @@ class Popup {
this.container.id = 'yomichan-float';
this.container.addEventListener('mousedown', e => e.stopPropagation());
this.container.addEventListener('scroll', e => e.stopPropagation());
this.container.setAttribute('src', chrome.extension.getURL('/fg/float.html'));
this.container.style.width = '0px';
this.container.style.height = '0px';
this.injectPromise = null;
@ -53,9 +54,13 @@ class Popup {
}
return new Promise((resolve) => {
const parent = (typeof this.frameId === 'number' ? this.frameId : '');
this.container.setAttribute('src', chrome.extension.getURL(`/fg/float.html?id=${this.id}&depth=${this.depth}&parent=${parent}`));
const parentFrameId = (typeof this.frameId === 'number' ? this.frameId : null);
this.container.addEventListener('load', () => {
this.invokeApi('popupNestedInitialize', {
id: this.id,
depth: this.depth,
parentFrameId
});
this.invokeApi('setOptions', {
general: {
customPopupCss: options.general.customPopupCss