Merge branch 'master' into testing

1 files changed, 4 insertions, 3 deletions

diff --git a/ext/fg/js/popup-nested.js b/ext/fg/js/popup-nested.js
index e0376bb2..b36de2ec 100644
--- a/ext/fg/js/popup-nested.js
+++ b/ext/fg/js/popup-nested.js
@@ -19,13 +19,14 @@
 
 let popupNestedInitialized = false;
 
-async function popupNestedInitialize(id, depth, parentFrameId) {
+async function popupNestedInitialize(id, depth, parentFrameId, url) {
     if (popupNestedInitialized) {
         return;
     }
     popupNestedInitialized = true;
 
-    const options = await apiOptionsGet();
+    const optionsContext = {depth, url};
+    const options = await apiOptionsGet(optionsContext);
     const popupNestingMaxDepth = options.scanning.popupNestingMaxDepth;
 
     if (!(typeof popupNestingMaxDepth === 'number' && typeof depth === 'number' && depth < popupNestingMaxDepth)) {
@@ -34,7 +35,7 @@ async function popupNestedInitialize(id, depth, parentFrameId) {
 
     const ignoreNodes = options.scanning.enableOnPopupExpressions ? [] : [ '.expression', '.expression *' ];
 
-    window.frontendInitializationData = {id, depth, parentFrameId, ignoreNodes};
+    window.frontendInitializationData = {id, depth, parentFrameId, ignoreNodes, url};
 
     const scriptSrcs = [
         '/fg/js/frontend-api-sender.js',