From 0cf21010193ace60783d60eeb5e52bfb2a221885 Mon Sep 17 00:00:00 2001
From: David Norton <david@nortoncrew.com>
Date: Thu, 20 Jul 2006 23:57:53 +0000
Subject: [PATCH] SelectItemsDialog (for See Also) unregisters tree views on
 close. Fixes minor display problems with Tags, See Also.

---
 chrome/chromeFiles/content/scholar/customControls.xml    | 2 +-
 chrome/chromeFiles/content/scholar/itemPane.xul          | 4 +++-
 chrome/chromeFiles/content/scholar/selectItemsDialog.js  | 7 +++++++
 chrome/chromeFiles/content/scholar/selectItemsDialog.xul | 1 +
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/chrome/chromeFiles/content/scholar/customControls.xml b/chrome/chromeFiles/content/scholar/customControls.xml
index 3dc1ca0579..bebbff1508 100644
--- a/chrome/chromeFiles/content/scholar/customControls.xml
+++ b/chrome/chromeFiles/content/scholar/customControls.xml
@@ -490,7 +490,7 @@
 		</implementation>
 		<content>
 			<xul:vbox xbl:inherits="flex">
-				<xul:hbox>
+				<xul:hbox align="center">
 					<xul:label id="seeAlsoNum"/>
 					<xul:button label="Add" oncommand="this.parentNode.parentNode.parentNode.add();"/>
 				</xul:hbox>
diff --git a/chrome/chromeFiles/content/scholar/itemPane.xul b/chrome/chromeFiles/content/scholar/itemPane.xul
index d2f95a6547..2bccbf4bce 100644
--- a/chrome/chromeFiles/content/scholar/itemPane.xul
+++ b/chrome/chromeFiles/content/scholar/itemPane.xul
@@ -44,6 +44,8 @@
 				<label value="Coming soon"/>
 			</vbox>
 		</tabpanels>
-		<linksbox id="editpane-links"/>
+		<hbox>
+			<linksbox id="editpane-links" flex="1"/>
+		</hbox>
 	</tabbox>
 </overlay>
\ No newline at end of file
diff --git a/chrome/chromeFiles/content/scholar/selectItemsDialog.js b/chrome/chromeFiles/content/scholar/selectItemsDialog.js
index f853d1ec4c..af8dad4532 100644
--- a/chrome/chromeFiles/content/scholar/selectItemsDialog.js
+++ b/chrome/chromeFiles/content/scholar/selectItemsDialog.js
@@ -10,6 +10,13 @@ function doLoad()
 	document.getElementById('collections-tree').view = collectionsView;
 }
 
+function doUnload()
+{
+	collectionsView.unregister();
+	if(itemsView)
+		itemsView.unregister();
+}
+
 function onCollectionSelected()
 {
 	if(itemsView)
diff --git a/chrome/chromeFiles/content/scholar/selectItemsDialog.xul b/chrome/chromeFiles/content/scholar/selectItemsDialog.xul
index cb76cee533..4c6dc2443d 100644
--- a/chrome/chromeFiles/content/scholar/selectItemsDialog.xul
+++ b/chrome/chromeFiles/content/scholar/selectItemsDialog.xul
@@ -13,6 +13,7 @@
 	buttons="cancel,accept"
 	ondialogaccept="doAccept();"
 	onload="doLoad();"
+	onunload="doUnload();"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	style="padding:2em">