mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Remove loadExtensionDefaults() in prefs.js

Browse source 
We now handle this in prefs.js.
This commit is contained in:
Dan Stillman 2023-07-26 07:22:22 -04:00
parent 5c26fe15d8
commit 6a2fcd6898
1 changed files with 0 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

117
chrome/content/zotero/xpcom/prefs.js
View file

@ -34,8 +34,6 @@ Zotero.Prefs = new function() {
this.rootBranch = Services.prefs.getBranch(""); this.rootBranch = Services.prefs.getBranch("");
this.init = async function init() { this.init = async function init() {
await loadExtensionDefaults();
// Register observer to handle pref changes // Register observer to handle pref changes
this.register(); this.register();
@ -393,121 +391,6 @@ Zotero.Prefs = new function() {
} }
/**
* Firefox 60 no longer loads default preferences for extensions, so do it manually
*/
async function loadExtensionDefaults() {
var defaultBranch = Services.prefs.getDefaultBranch("");
Cu.import("resource://gre/modules/AddonManager.jsm");
// Lines are in format `pref("[key]", [val]);`, so define a function to be called that
// sets the defaults
function pref(key, value) {
switch (typeof value) {
case "boolean":
defaultBranch.setBoolPref(key, value);
break;
case "number":
defaultBranch.setIntPref(key, value);
break;
case "string":
defaultBranch.setStringPref(key, value);
break;
}
}
function readDefaults(contents) {
let re = /^\s*pref\s*\(\s*['"]([a-zA-Z0-9_\-.]+)['"]\s*,\s*["']?.*["']?\s*\)\s*;\s*$/;
let lines = contents.split(/\n/g).filter(line => re.test(line));
for (let line of lines) {
try {
eval(line);
}
catch (e) {
dump(e + "\n\n");
Components.utils.reportError(e);
}
}
}
let addons = await AddonManager.getAllAddons();
var reusableStreamInstance = Cc['@mozilla.org/scriptableinputstream;1']
.createInstance(Ci.nsIScriptableInputStream);
for (let addon of addons) {
if (!addon.isActive) {
continue;
}
try {
let path = OS.Path.fromFileURI(addon.getResourceURI().spec);
// Hack to delete extensions.json for Mac users who first ran Zotero from the
// disk image and ended up with invalid integration plugin paths in
// extensions.json
try {
if (Zotero.isMac && path.includes('AppTranslocation')) {
await OS.File.remove(
OS.Path.join(Zotero.Profile.dir, 'extensions.json'),
{
ignoreAbsent: true
}
);
}
}
catch (e) {
Zotero.logError(e);
}
// Directory
if ((await OS.File.stat(path)).isDir) {
let dir = OS.Path.join(path, 'defaults', 'preferences');
if (await OS.File.exists(dir)) {
await Zotero.File.iterateDirectory(dir, async function (entry) {
if (!entry.name.endsWith('.js')) return;
readDefaults(Zotero.File.getContents(entry.path));
});
}
}
// XPI
else {
let file = Zotero.File.pathToFile(path);
let zipReader = Components.classes["@mozilla.org/libjar/zip-reader;1"].
createInstance(Components.interfaces.nsIZipReader);
try {
try {
zipReader.open(file);
zipReader.test(null);
}
catch (e) {
Zotero.logError(path + " is not a valid ZIP file");
continue;
}
let entries = zipReader.findEntries('defaults/preferences/*.js');
while (entries.hasMore()) {
let entryName = entries.getNext();
let entry = zipReader.getEntry(entryName);
if (!entry.isDirectory) {
let inputStream = zipReader.getInputStream(entryName);
reusableStreamInstance.init(inputStream);
readDefaults(reusableStreamInstance.read(entry.realSize));
}
}
}
finally {
zipReader.close();
}
}
}
catch (e) {
Zotero.logError(e);
}
}
}
this.getVirtualCollectionState = function (type) { this.getVirtualCollectionState = function (type) {
const prefKeys = { const prefKeys = {
duplicates: 'duplicateLibraries', duplicates: 'duplicateLibraries',