Merge branch 'master' into testing

1 files changed, 31 insertions, 3 deletions

diff --git a/ext/fg/js/frontend-initialize.js b/ext/fg/js/frontend-initialize.js
index 8424b21d..4a1409db 100644
--- a/ext/fg/js/frontend-initialize.js
+++ b/ext/fg/js/frontend-initialize.js
@@ -17,28 +17,56 @@
  */
 
 /* global
+ * FrameOffsetForwarder
  * Frontend
  * PopupProxy
  * PopupProxyHost
+ * apiForward
+ * apiOptionsGet
  */
 
 async function main() {
     await yomichan.prepare();
 
     const data = window.frontendInitializationData || {};
-    const {id, depth=0, parentFrameId, ignoreNodes, url, proxy=false} = data;
+    const {id, depth=0, parentFrameId, url, proxy=false} = data;
+
+    const optionsContext = {depth, url};
+    const options = await apiOptionsGet(optionsContext);
 
     let popup;
-    if (proxy) {
+    if (!proxy && (window !== window.parent) && options.general.showIframePopupsInRootFrame) {
+        const rootPopupInformationPromise = yomichan.getTemporaryListenerResult(
+            chrome.runtime.onMessage,
+            ({action, params}, {resolve}) => {
+                if (action === 'rootPopupInformation') {
+                    resolve(params);
+                }
+            }
+        );
+        apiForward('rootPopupRequestInformationBroadcast');
+        const {popupId, frameId} = await rootPopupInformationPromise;
+
+        const frameOffsetForwarder = new FrameOffsetForwarder();
+        frameOffsetForwarder.start();
+        const getFrameOffset = frameOffsetForwarder.getOffset.bind(frameOffsetForwarder);
+
+        popup = new PopupProxy(popupId, 0, null, frameId, url, getFrameOffset);
+        await popup.prepare();
+    } else if (proxy) {
         popup = new PopupProxy(null, depth + 1, id, parentFrameId, url);
+        await popup.prepare();
     } else {
+        const frameOffsetForwarder = new FrameOffsetForwarder();
+        frameOffsetForwarder.start();
+
         const popupHost = new PopupProxyHost();
         await popupHost.prepare();
 
         popup = popupHost.getOrCreatePopup(null, null, depth);
     }
 
-    const frontend = new Frontend(popup, ignoreNodes);
+    const frontend = new Frontend(popup);
     await frontend.prepare();
 }