add option for iframe popups

FooSoft · Apr 4, 2020 · 9b87a55 · 9b87a55
1 parent 320d63c
commit 9b87a55
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/ext/bg/data/options-schema.json b/ext/bg/data/options-schema.json
@@ -105,7 +105,8 @@
                                     "customPopupCss",
                                     "customPopupOuterCss",
                                     "enableWanakana",
-                                    "enableClipboardMonitor"
+                                    "enableClipboardMonitor",
+                                    "showIframePopupsInRootFrame"
                                 ],
                                 "properties": {
                                     "enable": {
@@ -227,6 +228,10 @@
                                     "enableClipboardMonitor": {
                                         "type": "boolean",
                                         "default": false
+                                    },
+                                    "showIframePopupsInRootFrame": {
+                                        "type": "boolean",
+                                        "default": false
                                     }
                                 }
                             },

diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
@@ -124,7 +124,8 @@ function profileOptionsCreateDefaults() {
             customPopupCss: '',
             customPopupOuterCss: '',
             enableWanakana: true,
-            enableClipboardMonitor: false
+            enableClipboardMonitor: false,
+            showIframePopupsInRootFrame: false
         },
 
         audio: {

diff --git a/ext/bg/js/settings/main.js b/ext/bg/js/settings/main.js
@@ -84,6 +84,7 @@ async function formRead(options) {
     options.general.popupScalingFactor = parseFloat($('#popup-scaling-factor').val());
     options.general.popupScaleRelativeToPageZoom = $('#popup-scale-relative-to-page-zoom').prop('checked');
     options.general.popupScaleRelativeToVisualViewport = $('#popup-scale-relative-to-visual-viewport').prop('checked');
+    options.general.showIframePopupsInRootFrame = $('#show-iframe-popups-in-root-frame').prop('checked');
     options.general.popupTheme = $('#popup-theme').val();
     options.general.popupOuterTheme = $('#popup-outer-theme').val();
     options.general.customPopupCss = $('#custom-popup-css').val();
@@ -161,6 +162,7 @@ async function formWrite(options) {
     $('#popup-scaling-factor').val(options.general.popupScalingFactor);
     $('#popup-scale-relative-to-page-zoom').prop('checked', options.general.popupScaleRelativeToPageZoom);
     $('#popup-scale-relative-to-visual-viewport').prop('checked', options.general.popupScaleRelativeToVisualViewport);
+    $('#show-iframe-popups-in-root-frame').prop('checked', options.general.showIframePopupsInRootFrame);
     $('#popup-theme').val(options.general.popupTheme);
     $('#popup-outer-theme').val(options.general.popupOuterTheme);
     $('#custom-popup-css').val(options.general.customPopupCss);

diff --git a/ext/bg/settings.html b/ext/bg/settings.html
@@ -162,6 +162,10 @@ <h3>General Options</h3>
                     <label><input type="checkbox" id="popup-scale-relative-to-visual-viewport"> Change popup size relative to page viewport</label>
                 </div>
 
+                <div class="checkbox options-advanced">
+                    <label><input type="checkbox" id="show-iframe-popups-in-root-frame"> Show iframe popups in root frame</label>
+                </div>
+
                 <div class="checkbox options-advanced">
                     <label><input type="checkbox" id="show-debug-info"> Show debug information</label>
                 </div>

diff --git a/ext/fg/js/frontend-initialize.js b/ext/fg/js/frontend-initialize.js
@@ -22,6 +22,7 @@
  * PopupProxy
  * PopupProxyHost
  * apiForward
+ * apiOptionsGet
  */
 
 async function main() {
@@ -30,8 +31,11 @@ async function main() {
     const data = window.frontendInitializationData || {};
     const {id, depth=0, parentFrameId, url, proxy=false} = data;
 
+    const optionsContext = {depth, url};
+    const options = await apiOptionsGet(optionsContext);
+
     let popup;
-    if (!proxy && (window !== window.parent)) {
+    if (!proxy && (window !== window.parent) && options.general.showIframePopupsInRootFrame) {
         const rootPopupInformationPromise = yomichan.getTemporaryListenerResult(
             chrome.runtime.onMessage,
             ({action, params}, {resolve}) => {