@@ -17,10 +17,11 @@ class UserScriptManager: FeatureFlaggable {
1717 source: " window.__firefox__.NoImageMode.setEnabled(true) " ,
1818 injectionTime: . atDocumentStart,
1919 forMainFrameOnly: true )
20- private let nightModeUserScript = WKUserScript . createInDefaultContentWorld (
21- source: " window.__firefox__.NightMode.setEnabled (true)" ,
20+ private let nightModeUserScript = WKUserScript (
21+ source: NightModeHelper . jsCallbackBuilder ( true ) ,
2222 injectionTime: . atDocumentEnd,
23- forMainFrameOnly: true )
23+ forMainFrameOnly: true ,
24+ in: . world( name: NightModeHelper . name ( ) ) )
2425 private let printHelperUserScript = WKUserScript . createInPageContentWorld (
2526 source: " window.print = function () { window.webkit.messageHandlers.printHandler.postMessage({}) } " ,
2627 injectionTime: . atDocumentEnd,
@@ -39,8 +40,7 @@ class UserScriptManager: FeatureFlaggable {
3940 let mainframeString = mainFrameOnly ? " MainFrame " : " AllFrames "
4041 let injectionString = injectionTime == . atDocumentStart ? " Start " : " End "
4142 let name = mainframeString + " AtDocument " + injectionString
42- if let path = Bundle . main. path ( forResource: name, ofType: " js " ) ,
43- let source = try ? NSString ( contentsOfFile: path, encoding: String . Encoding. utf8. rawValue) as String {
43+ if let source = UserScriptManager . getScriptSource ( name) {
4444 let wrappedSource = " (function() { const APP_ID_TOKEN = ' \( UserScriptManager . appIdToken) '; \( source) })() "
4545 let userScript = WKUserScript . createInDefaultContentWorld (
4646 source: wrappedSource,
@@ -52,11 +52,7 @@ class UserScriptManager: FeatureFlaggable {
5252
5353 // Autofill scripts
5454 let autofillName = " Autofill \( name) "
55- if let autofillScriptCompatPath = Bundle . main. path (
56- forResource: autofillName, ofType: " js " ) ,
57- let source = try ? NSString (
58- contentsOfFile: autofillScriptCompatPath,
59- encoding: String . Encoding. utf8. rawValue) as String {
55+ if let source = UserScriptManager . getScriptSource ( autofillName) {
6056 let wrappedSource = " (function() { const APP_ID_TOKEN = ' \( UserScriptManager . appIdToken) '; \( source) })() "
6157 let userScript = WKUserScript . createInDefaultContentWorld (
6258 source: wrappedSource,
@@ -65,15 +61,20 @@ class UserScriptManager: FeatureFlaggable {
6561 compiledUserScripts [ autofillName] = userScript
6662 }
6763
64+ // NightMode scripts
65+ let nightModeName = " NightMode \( name) "
66+ if let source = UserScriptManager . getScriptSource ( nightModeName) {
67+ let wrappedSource = " (function() { const APP_ID_TOKEN = ' \( UserScriptManager . appIdToken) '; \( source) })() "
68+ let userScript = WKUserScript (
69+ source: wrappedSource,
70+ injectionTime: injectionTime,
71+ forMainFrameOnly: mainFrameOnly,
72+ in: . world( name: NightModeHelper . name ( ) ) )
73+ compiledUserScripts [ nightModeName] = userScript
74+ }
75+
6876 let webcompatName = " Webcompat \( name) "
69- if let webCompatPath = Bundle . main. path (
70- forResource: webcompatName,
71- ofType: " js "
72- ) ,
73- let source = try ? NSString (
74- contentsOfFile: webCompatPath,
75- encoding: String . Encoding. utf8. rawValue
76- ) as String {
77+ if let source = UserScriptManager . getScriptSource ( webcompatName) {
7778 let wrappedSource = " (function() { const APP_ID_TOKEN = ' \( UserScriptManager . appIdToken) '; \( source) })() "
7879 let userScript = WKUserScript . createInPageContentWorld (
7980 source: wrappedSource,
@@ -87,6 +88,13 @@ class UserScriptManager: FeatureFlaggable {
8788 self . compiledUserScripts = compiledUserScripts
8889 }
8990
91+ private static func getScriptSource( _ scriptName: String ) -> String ? {
92+ guard let path = Bundle . main. path ( forResource: scriptName, ofType: " js " ) else {
93+ return nil
94+ }
95+ return try ? NSString ( contentsOfFile: path, encoding: String . Encoding. utf8. rawValue) as String
96+ }
97+
9098 public func injectUserScriptsIntoWebView( _ webView: WKWebView ? , nightMode: Bool , noImageMode: Bool ) {
9199 // Start off by ensuring that any previously-added user scripts are
92100 // removed to prevent the same script from being injected twice.
@@ -110,6 +118,11 @@ class UserScriptManager: FeatureFlaggable {
110118 webView? . configuration. userContentController. addUserScript ( autofillScript)
111119 }
112120
121+ let nightModeName = " NightMode \( name) "
122+ if let nightModeScript = compiledUserScripts [ nightModeName] {
123+ webView? . configuration. userContentController. addUserScript ( nightModeScript)
124+ }
125+
113126 let webcompatName = " Webcompat \( name) "
114127 if let webcompatUserScript = compiledUserScripts [ webcompatName] {
115128 webView? . configuration. userContentController. addUserScript ( webcompatUserScript)
0 commit comments