Skip to content

Commit 781de8f

Browse files
committed
Update patcher files for FF136b1+
1 parent 98be2a3 commit 781de8f

File tree

8 files changed

+22
-14
lines changed

8 files changed

+22
-14
lines changed

Installers/Multirow & other functions/Builder.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -787,6 +787,8 @@ def remove_profile_patch(firefox_profile):
787787
remove_file_if_exists(os.path.normpath(firefox_profile + "/chrome/utils/RDFManifestConverter.jsm"))
788788
remove_file_if_exists(os.path.normpath(firefox_profile + "/chrome/utils/userChrome.jsm"))
789789
remove_file_if_exists(os.path.normpath(firefox_profile + "/chrome/utils/xPref.jsm"))
790+
remove_file_if_exists(os.path.normpath(firefox_profile + "/chrome/utils/xPref.sys.mjs"))
791+
remove_file_if_exists(os.path.normpath(firefox_profile + "/chrome/utils/userChrome.js"))
790792

791793
util_chrome_files = []
792794
for r, d, f in os.walk(os.path.normpath(firefox_profile + CHROME_FOLDER + UTILS_FOLDER)):

Installers/Multirow & other functions/Quantum-Nox-Installer.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -788,6 +788,8 @@ def remove_profile_patch(firefox_profile):
788788
remove_file_if_exists(os.path.normpath(firefox_profile + "/chrome/utils/RDFManifestConverter.jsm"))
789789
remove_file_if_exists(os.path.normpath(firefox_profile + "/chrome/utils/userChrome.jsm"))
790790
remove_file_if_exists(os.path.normpath(firefox_profile + "/chrome/utils/xPref.jsm"))
791+
remove_file_if_exists(os.path.normpath(firefox_profile + "/chrome/utils/xPref.sys.mjs"))
792+
remove_file_if_exists(os.path.normpath(firefox_profile + "/chrome/utils/userChrome.js"))
791793

792794
util_chrome_files = []
793795
for r, d, f in os.walk(os.path.normpath(firefox_profile + CHROME_FOLDER + UTILS_FOLDER)):

Installers/Multirow & other functions/root/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ try {
1212
} catch (ex) {}
1313

1414
try {
15-
ChromeUtils.import('chrome://userchromejs/content/userChrome.jsm');
15+
Services.scriptloader.loadSubScript('chrome://userchromejs/content/userChrome.js');
1616
} catch (ex) {}

Installers/Multirow & other functions/utils/userChrome.jsm renamed to Installers/Multirow & other functions/utils/userChrome.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
let EXPORTED_SYMBOLS = [];
1+
'use strict';
22

33
const Services = globalThis.Services || ChromeUtils.import("resource://gre/modules/Services.jsm").Services;
4-
const { xPref } = ChromeUtils.import('chrome://userchromejs/content/xPref.jsm');
5-
const { Management } = ChromeUtils.import('resource://gre/modules/Extension.jsm');
6-
const { AppConstants } = ChromeUtils.import('resource://gre/modules/AppConstants.jsm');
4+
ChromeUtils.defineESModuleGetters(this, {
5+
xPref: 'chrome://userchromejs/content/xPref.sys.mjs',
6+
Management: 'resource://gre/modules/Extension.sys.mjs',
7+
AppConstants: 'resource://gre/modules/AppConstants.sys.mjs',
8+
});
79

810
let UC = {
911
webExts: new Map(),

Installers/Multirow & other functions/utils/xPref.jsm renamed to Installers/Multirow & other functions/utils/xPref.sys.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
let EXPORTED_SYMBOLS = ['xPref'];
1+
'use strict';
22

3-
var xPref = {
3+
export const xPref = {
44
// Retorna o valor da preferência, seja qual for o tipo, mas não
55
// testei com tipos complexos como nsIFile, não sei como detectar
66
// uma preferência assim, na verdade nunca vi uma

Multirow and other functions/JS Loader/root/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ try {
1212
} catch (ex) {}
1313

1414
try {
15-
ChromeUtils.import('chrome://userchromejs/content/userChrome.jsm');
15+
Services.scriptloader.loadSubScript('chrome://userchromejs/content/userChrome.js');
1616
} catch (ex) {}

Multirow and other functions/JS Loader/utils/userChrome.jsm renamed to Multirow and other functions/JS Loader/utils/userChrome.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
let EXPORTED_SYMBOLS = [];
1+
'use strict';
22

33
const Services = globalThis.Services || ChromeUtils.import("resource://gre/modules/Services.jsm").Services;
4-
const { xPref } = ChromeUtils.import('chrome://userchromejs/content/xPref.jsm');
5-
const { Management } = ChromeUtils.import('resource://gre/modules/Extension.jsm');
6-
const { AppConstants } = ChromeUtils.import('resource://gre/modules/AppConstants.jsm');
4+
ChromeUtils.defineESModuleGetters(this, {
5+
xPref: 'chrome://userchromejs/content/xPref.sys.mjs',
6+
Management: 'resource://gre/modules/Extension.sys.mjs',
7+
AppConstants: 'resource://gre/modules/AppConstants.sys.mjs',
8+
});
79

810
let UC = {
911
webExts: new Map(),

Multirow and other functions/JS Loader/utils/xPref.jsm renamed to Multirow and other functions/JS Loader/utils/xPref.sys.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
let EXPORTED_SYMBOLS = ['xPref'];
1+
'use strict';
22

3-
var xPref = {
3+
export const xPref = {
44
// Retorna o valor da preferência, seja qual for o tipo, mas não
55
// testei com tipos complexos como nsIFile, não sei como detectar
66
// uma preferência assim, na verdade nunca vi uma

0 commit comments

Comments
 (0)