Use nsIWindowWatcher in Zotero.openInViewer()

Instead of getting the last browser window
Juris-M · Jul 30, 2017 · ee0b4f5 · ee0b4f5
1 parent 991967d
commit ee0b4f5
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
@@ -1054,9 +1054,13 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
 		if (win) {
 			win.loadURI(uri);
 		} else {
-			let window = wm.getMostRecentWindow("navigator:browser");
-			win = window.openDialog("chrome://zotero/content/standalone/basicViewer.xul",
-				"basicViewer", "chrome,resizable,centerscreen,menubar,scrollbars", uri);
+			let ww = Components.classes['@mozilla.org/embedcomp/window-watcher;1']
+				.getService(Components.interfaces.nsIWindowWatcher);
+			let arg = Components.classes["@mozilla.org/supports-string;1"]
+				.createInstance(Components.interfaces.nsISupportsString);
+			arg.data = uri;
+			win = ww.openWindow(null, "chrome://zotero/content/standalone/basicViewer.xul",
+				"basicViewer", "chrome,dialog=yes,resizable,centerscreen,menubar,scrollbars", arg);
 		}
 		if (onLoad) {
 			let browser