Merge pull request #417 from siikamiika/iframe-popups-2

Show iframe popups on root page

5 files changed, 15 insertions, 2 deletions

diff --git a/ext/bg/data/options-schema.json b/ext/bg/data/options-schema.json
index cb759b72..da1f1ce0 100644
--- a/ext/bg/data/options-schema.json
+++ b/ext/bg/data/options-schema.json
@@ -108,7 +108,8 @@
                                     "enableClipboardMonitor",
                                     "showPitchAccentDownstepNotation",
                                     "showPitchAccentPositionNotation",
-                                    "showPitchAccentGraph"
+                                    "showPitchAccentGraph",
+                                    "showIframePopupsInRootFrame"
                                 ],
                                 "properties": {
                                     "enable": {
@@ -242,6 +243,10 @@
                                     "showPitchAccentGraph": {
                                         "type": "boolean",
                                         "default": false
+                                    },
+                                    "showIframePopupsInRootFrame": {
+                                        "type": "boolean",
+                                        "default": false
                                     }
                                 }
                             },
diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index b36fe812..5c68c403 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -127,7 +127,8 @@ function profileOptionsCreateDefaults() {
             enableClipboardMonitor: false,
             showPitchAccentDownstepNotation: true,
             showPitchAccentPositionNotation: true,
-            showPitchAccentGraph: false
+            showPitchAccentGraph: false,
+            showIframePopupsInRootFrame: false
         },
 
         audio: {
diff --git a/ext/bg/js/search-frontend.js b/ext/bg/js/search-frontend.js
index 2d2aa8d4..f130a6fa 100644
--- a/ext/bg/js/search-frontend.js
+++ b/ext/bg/js/search-frontend.js
@@ -35,6 +35,7 @@ async function searchFrontendSetup() {
     const scriptSrcs = [
         '/mixed/js/text-scanner.js',
         '/fg/js/frontend-api-receiver.js',
+        '/fg/js/frame-offset-forwarder.js',
         '/fg/js/popup.js',
         '/fg/js/popup-proxy-host.js',
         '/fg/js/frontend.js',
diff --git a/ext/bg/js/settings/main.js b/ext/bg/js/settings/main.js
index 7caeaea0..1653ee35 100644
--- a/ext/bg/js/settings/main.js
+++ b/ext/bg/js/settings/main.js
@@ -87,6 +87,7 @@ async function formRead(options) {
     options.general.showPitchAccentDownstepNotation = $('#show-pitch-accent-downstep-notation').prop('checked');
     options.general.showPitchAccentPositionNotation = $('#show-pitch-accent-position-notation').prop('checked');
     options.general.showPitchAccentGraph = $('#show-pitch-accent-graph').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();
@@ -167,6 +168,7 @@ async function formWrite(options) {
     $('#show-pitch-accent-downstep-notation').prop('checked', options.general.showPitchAccentDownstepNotation);
     $('#show-pitch-accent-position-notation').prop('checked', options.general.showPitchAccentPositionNotation);
     $('#show-pitch-accent-graph').prop('checked', options.general.showPitchAccentGraph);
+    $('#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
index 0b2e4f9c..237162c7 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -175,6 +175,10 @@
                 </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>