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

don't load all addons on Fx4 startup

Browse source
This commit is contained in:
Simon Kornblith 2010-11-05 05:05:36 +00:00
parent 6d320ab307
commit fb91854601
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -231,13 +231,6 @@ var Zotero = new function(){
this.isLinux = (this.platform.substr(0, 5) == "Linux");
this.oscpu = win.navigator.oscpu;
// Installed extensions (Fx4 only)
if(this.isFx4) {
AddonManager.getAllAddons(function(addonList) {
Zotero.addons = addonList;
});
}
// Locale
var ph = Components.classes["@mozilla.org/network/protocol;1?name=http"].
getService(Components.interfaces.nsIHttpProtocolHandler);
@ -978,7 +971,10 @@ var Zotero = new function(){
*/
this.getInstalledExtensions = function () {
if(this.isFx4) {
while(!Zotero.addons) Zotero.mainThread.processNextEvent(true);
if(!Zotero.addons) {
AddonManager.getAllAddons(function(addonList) { Zotero.addons = addonList; });
while(!Zotero.addons) Zotero.mainThread.processNextEvent(true);
}
var installed = Zotero.addons;
} else {
var em = Components.classes["@mozilla.org/extensions/manager;1"].