Commit e80b687 1 parent 9327d74 commit e80b687 Copy full SHA for e80b687
File tree 2 files changed +16
-10
lines changed
web/packages/extension/src
2 files changed +16
-10
lines changed Original file line number Diff line number Diff line change @@ -78,6 +78,8 @@ function injectScriptURL(url: string): Promise<void> {
78
78
} ) ;
79
79
script . charset = "utf-8" ;
80
80
script . src = url ;
81
+ // safari 16+ script.src will be masked to "webkit-masked-url://hidden/"
82
+ script . setAttribute ( "ruffle-id" , String ( ID ) ) ;
81
83
( document . head || document . documentElement ) . append ( script ) ;
82
84
return promise ;
83
85
}
Original file line number Diff line number Diff line change @@ -28,16 +28,20 @@ function handleMessage(message: Message) {
28
28
}
29
29
30
30
let ID : string | null = null ;
31
- if (
32
- document . currentScript !== undefined &&
33
- document . currentScript !== null &&
34
- "src" in document . currentScript &&
35
- document . currentScript . src !== ""
36
- ) {
37
- try {
38
- ID = new URL ( document . currentScript . src ) . searchParams . get ( "id" ) ;
39
- } catch ( _ ) {
40
- // ID remains null.
31
+ if ( document . currentScript !== undefined && document . currentScript !== null ) {
32
+ if ( "src" in document . currentScript && document . currentScript . src !== "" ) {
33
+ try {
34
+ ID = new URL ( document . currentScript . src ) . searchParams . get ( "id" ) ;
35
+ } catch ( _ ) {
36
+ // ID remains null.
37
+ }
38
+ }
39
+ if ( ID === null ) {
40
+ // if `script.src` is masked, get id from attrs
41
+ const ruffleId = document . currentScript . getAttribute ( "ruffle-id" ) ;
42
+ if ( ruffleId ) {
43
+ ID = ruffleId ;
44
+ }
41
45
}
42
46
}
43
47
You can’t perform that action at this time.
0 commit comments