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

Remove unnecessary part of 58c2e38ec2

Browse source 
getAllAddons() waits for extensions to be initialized, so the code in
Prefs::loadExtensionDefaults() to delete an extensions.json with an
AppTranslocation path should be sufficient, and it shouldn't be
necessary to check for it after showing the AppTranslocation startup
error.
This commit is contained in:
Dan Stillman 2020-03-21 00:53:14 -04:00
parent 58c2e38ec2
commit 9d330206ed
1 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
chrome/content/zotero/xpcom/zotero.js
View file

@ -1806,7 +1806,7 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
if (Zotero.isMac && OS.Constants.Path.libDir.includes('AppTranslocation')) {
let ps = Services.prompt;
let buttonFlags = ps.BUTTON_POS_0 * ps.BUTTON_TITLE_IS_STRING;
let index = ps.confirmEx(
ps.confirmEx(
null,
Zotero.getString('general.error'),
Zotero.getString('startupError.startedFromDiskImage1', Zotero.clientName)
@ -1816,21 +1816,6 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
Zotero.getString('general.quitApp', Zotero.clientName),
null, null, null, {}
);
// If the integration plugins were installed from the AppTranslocation path, delete
// extensions.json
try {
let file = OS.Path.join(Zotero.Profile.dir, 'extensions.json');
let json = JSON.parse(Zotero.File.getContents(file));
if (json.addons.some(x => x.path.includes('AppTranslocation'))) {
file = Zotero.File.pathToFile(file);
file.remove(null);
}
}
catch (e) {
Zotero.logError(e);
}
Zotero.Utilities.Internal.quit();
return false;
}