From b17526734fdd1564b59f4a7f14d2aed63eec294f Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Thu, 12 Jun 2008 17:34:11 +0000
Subject: [PATCH] Fixes #1040, Related items broken in 1.0.5

Fixes error in citation windows in Firefox 2 that would've prevented the Windows off-center window fix
---
 chrome/content/zotero/bindings/relatedbox.xml | 6 ++----
 chrome/content/zotero/selectItemsDialog.js    | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/chrome/content/zotero/bindings/relatedbox.xml b/chrome/content/zotero/bindings/relatedbox.xml
index 9f0ab20eb..4bec59f7c 100644
--- a/chrome/content/zotero/bindings/relatedbox.xml
+++ b/chrome/content/zotero/bindings/relatedbox.xml
@@ -139,10 +139,8 @@
 					<![CDATA[
 						var io = {dataIn: null, dataOut: null};
 						
-						Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
-							.getService(Components.interfaces.nsIWindowWatcher)
-							.openWindow(null, 'chrome://zotero/content/selectItemsDialog.xul', '',
-								'chrome,modal,centerscreen', io);
+						window.openDialog('chrome://zotero/content/selectItemsDialog.xul', '',
+								'chrome,dialog=no,modal,centerscreen', io);
 						
 						if(io.dataOut && this.item)
 						{
diff --git a/chrome/content/zotero/selectItemsDialog.js b/chrome/content/zotero/selectItemsDialog.js
index bff07b766..d7512cb35 100644
--- a/chrome/content/zotero/selectItemsDialog.js
+++ b/chrome/content/zotero/selectItemsDialog.js
@@ -40,10 +40,10 @@ function doLoad()
 	collectionsView = new Zotero.CollectionTreeView();
 	document.getElementById('zotero-collections-tree').view = collectionsView;
 	
-	// Center popup manually after a delay on Windows, since window
-	// isn't resizable and there might be a persisted position
+	// Center citation popups manually after a delay on Windows, since windows
+	// aren't resizable and there might be persisted positions
 	if (Zotero.isWin &&
-			window.document.activeElement.id != 'zotero-select-items-dialog') {
+			window.document.documentURI != 'chrome://zotero/content/selectItemsDialog.xul') {
 		setTimeout(function () {
 			window.centerWindowOnScreen();
 		}, 1);