www

commit 9077b2f4951c337b34b70fbd08657a97f0e91e0a
parent 70a91f9674888926aedce2fe35331de5ff5992e1
Author: Dan Stillman <dstillman@zotero.org>
Date:   Thu, 21 Jul 2016 14:07:27 -0400

Fix display of some icons in Standalone

Diffstat:
M
chrome/content/zotero/overlay.js
 | 
6
+-----
M
chrome/content/zotero/xpcom/zotero.js
 | 
2
++
M
chrome/content/zotero/zoteroPane.js
 | 
4
++++

3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/chrome/content/zotero/overlay.js b/chrome/content/zotero/overlay.js
@@ -86,9 +86,7 @@ var ZoteroOverlay = new function()
 			
 			observerService.addObserver(zoteroObserver, "browser-delayed-startup-finished", false);
 			
-			// Set flags for hi-res displays
-			Zotero.hiDPI = window.devicePixelRatio > 1;
-			Zotero.hiDPISuffix = Zotero.hiDPI ? "@2x" : "";
+			ZoteroPane.init();
 			
 			// Clear old Zotero icon pref
 			var prefBranch = Components.classes["@mozilla.org/preferences-service;1"]
@@ -105,8 +103,6 @@ var ZoteroOverlay = new function()
 				Zotero.logError(e);
 			}
 			
-			ZoteroPane.init();
-			
 			// TODO: Add only when progress window is open
 			document.getElementById('appcontent').addEventListener('mousemove', Zotero.ProgressWindowSet.updateTimers, false);
 			
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
@@ -103,6 +103,8 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
 	this.unlockDeferred;
 	this.unlockPromise;
 	
+	this.hiDPISuffix = "";
+	
 	var _startupErrorHandler;
 	var _zoteroDirectory = false;
 	var _localizedStringBundle;
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
@@ -82,6 +82,10 @@ var ZoteroPane = new function()
 			window.document.documentElement.setAttribute('sizemode', 'normal');
 		}
 		
+		// Set flags for hi-res displays
+		Zotero.hiDPI = window.devicePixelRatio > 1;
+		Zotero.hiDPISuffix = Zotero.hiDPI ? "@2x" : "";
+		
 		// Set "Report Errors..." label via property rather than DTD entity,
 		// since we need to reference it in script elsewhere
 		document.getElementById('zotero-tb-actions-reportErrors').setAttribute('label',