www

commit a1f327a97a2accd378b6a358ed958882fe594aa6
parent 0e46cdec10771cec66a198c22c303e32777bffc1
Author: Simon Kornblith <simon@simonster.com>
Date:   Sun,  7 Nov 2010 04:18:58 +0000

tweaks to prefs window opening


Diffstat:
M
chrome/content/zotero/preferences/preferences.js
 | 
1
+
M
components/zotero-protocol-handler.js
 | 
3
++-

2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/chrome/content/zotero/preferences/preferences.js b/chrome/content/zotero/preferences/preferences.js
@@ -62,6 +62,7 @@ function init()
 	
 	if(window.arguments) {
 		_io = window.arguments[0];
+		if(_io.wrappedJSObject) _io = _io.wrappedJSObject;
 		
 		if(_io.pane) {
 			var pane = document.getElementById(_io.pane);
diff --git a/components/zotero-protocol-handler.js b/components/zotero-protocol-handler.js
@@ -1062,8 +1062,9 @@ function ChromeExtensionHandler() {
 			if(s.length == 2) {
 				data.pane = s[1];
 			}
+			data.wrappedJSObject = data;
 			
-			if(Zotero.isFx4) {
+			if(Zotero.isFx4 || !Zotero.isMac) {
 				var win = Components.classes["@mozilla.org/appshell/window-mediator;1"]
 					.getService(Components.interfaces.nsIWindowMediator)
 					.getMostRecentWindow("navigator:browser");