1.17.5

[mv3] Load user script for iframes
brookhong · Nov 25, 2024 · eb58929 · eb58929
1 parent 3eaff3f
commit eb58929
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Surfingkeys",
-  "version": "1.17.4",
+  "version": "1.17.5",
   "description": "Map your keys for web surfing, expand your browser with javascript and keyboard.",
   "main": "background.js",
   "directories": {

diff --git a/src/content_scripts/content.js b/src/content_scripts/content.js
@@ -188,6 +188,9 @@ window.getFrameId = function () {
             && window.frameElement.offsetWidth > 16 && window.frameElement.offsetWidth > 16))
     ) {
         _initContent(_initModules());
+
+        // Only used to load user script for iframes in MV3
+        dispatchSKEvent('user', ["runUserScript"]);
     }
     return window.frameId;
 };

diff --git a/src/user_scripts/index.js b/src/user_scripts/index.js
@@ -68,6 +68,7 @@ const functionsToListSuggestions = {};
 let inlineQuery;
 let hintsFunction;
 let onClipboardReadFn;
+let userScriptTask = () => {};
 initSKFunctionListener("user", {
     callUserFunction: (keys, para) => {
         if (userDefinedFunctions.hasOwnProperty(keys)) {
@@ -93,6 +94,9 @@ initSKFunctionListener("user", {
             }
         });
     },
+    runUserScript: () => {
+        userScriptTask();
+    },
     onClipboardRead: (resp) => {
         onClipboardReadFn(resp);
     },
@@ -227,11 +231,16 @@ const api = {
 export default (extensionRootUrl, uf) => {
     EXTENSION_ROOT_URL = extensionRootUrl;
     if (isInUIFrame()) return;
-    var settings = {}, error = "";
-    try {
-        uf(api, settings);
-    } catch(e) {
-        error = e.toString();
+    userScriptTask = () => {
+        var settings = {}, error = "";
+        try {
+            uf(api, settings);
+        } catch(e) {
+            error = e.toString();
+        }
+        applyUserSettings({settings, error});
+    };
+    if (window === top) {
+        userScriptTask();
     }
-    applyUserSettings({settings, error});
 };