www

commit fb9185460185576b1d8f40df522dd08c42d7dff9
parent 6d320ab3075cfd586c22ae97fb0a5a9deb5fbe4c
Author: Simon Kornblith <simon@simonster.com>
Date:   Fri,  5 Nov 2010 05:05:36 +0000

don't load all addons on Fx4 startup


Diffstat:
M
chrome/content/zotero/xpcom/zotero.js
 | 
12
++++--------

1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
@@ -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"].