From 22e848c9c22e48cd5375e23b625fa029d44b27b5 Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Mon, 21 Apr 2025 08:11:22 -0400
Subject: [PATCH] [mv3] Fix zapper

Regression from:
https://github.com/gorhill/uBlock/commit/b5651417aacd6024cb0a89a2b357563c0761a5e6
---
 platform/mv3/extension/js/scripting/zapper.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/platform/mv3/extension/js/scripting/zapper.js b/platform/mv3/extension/js/scripting/zapper.js
index 5a0e81c58..a373498a2 100644
--- a/platform/mv3/extension/js/scripting/zapper.js
+++ b/platform/mv3/extension/js/scripting/zapper.js
@@ -371,7 +371,7 @@ const bootstrap = async ( ) => {
     return new Promise(resolve => {
         const frame = document.createElement('iframe');
         frame.setAttribute(zapperSecret, '');
-        frame.onload = ( ) => {
+        const onZapperLoad = ( ) => {
             frame.onload = null;
             frame.setAttribute(`${zapperSecret}-loaded`, '');
             const channel = new MessageChannel();
@@ -395,13 +395,11 @@ const bootstrap = async ( ) => {
                 zapperFramePort: port,
             });
         };
-        if ( dynamicURL.protocol !== 'safari-web-extension:' ) {
-            document.documentElement.append(frame);
+        frame.onload = ( ) => {
+            frame.onload = onZapperLoad;
             frame.contentWindow.location = dynamicURL.href;
-        } else {
-            frame.setAttribute('src', dynamicURL.href);
-            document.documentElement.append(frame);
-        }
+        };
+        document.documentElement.append(frame);
     });
 };