From 62ffea9542128c0296a9f785cbfd150e876ec2dd Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Fri, 25 Aug 2006 19:15:03 +0000
Subject: [PATCH] closes #209, Scholar does not refresh the item pane when a
 new collection is clicked

it's possible that this fix will introduce some bugs, but it appears to work fine
---
 .../chromeFiles/content/scholar/overlay.xul   |  2 --
 .../content/scholar/selectItemsDialog.xul     |  2 --
 .../scholar/{ => xpcom}/collectionTreeView.js |  0
 .../content/scholar/xpcom/ingester.js         |  1 -
 .../scholar/{ => xpcom}/itemTreeView.js       | 22 +++++++++++++------
 .../content/scholar/xpcom/scholar.js          |  6 +++--
 components/chnmIScholarService.js             | 16 ++++++++++++++
 7 files changed, 35 insertions(+), 14 deletions(-)
 rename chrome/chromeFiles/content/scholar/{ => xpcom}/collectionTreeView.js (100%)
 rename chrome/chromeFiles/content/scholar/{ => xpcom}/itemTreeView.js (97%)

diff --git a/chrome/chromeFiles/content/scholar/overlay.xul b/chrome/chromeFiles/content/scholar/overlay.xul
index 113ac2063..8126e6023 100644
--- a/chrome/chromeFiles/content/scholar/overlay.xul
+++ b/chrome/chromeFiles/content/scholar/overlay.xul
@@ -29,8 +29,6 @@
 	<script src="include.js"/>
 	
 	<script src="overlay.js"/>
-    <script src="itemTreeView.js"/>
-    <script src="collectionTreeView.js"/>
     <script src="fileInterface.js"/>
 	
 	<commandset id="mainCommandSet">
diff --git a/chrome/chromeFiles/content/scholar/selectItemsDialog.xul b/chrome/chromeFiles/content/scholar/selectItemsDialog.xul
index a2b6de2e6..28bc8a7c2 100644
--- a/chrome/chromeFiles/content/scholar/selectItemsDialog.xul
+++ b/chrome/chromeFiles/content/scholar/selectItemsDialog.xul
@@ -37,8 +37,6 @@
 	style="padding:2em">
 	
 	<script src="include.js"/>
-	<script src="collectionTreeView.js"/>
-	<script src="itemTreeView.js"/>
 	<script src="selectItemsDialog.js"/>
 	
 	<hbox flex="1">
diff --git a/chrome/chromeFiles/content/scholar/collectionTreeView.js b/chrome/chromeFiles/content/scholar/xpcom/collectionTreeView.js
similarity index 100%
rename from chrome/chromeFiles/content/scholar/collectionTreeView.js
rename to chrome/chromeFiles/content/scholar/xpcom/collectionTreeView.js
diff --git a/chrome/chromeFiles/content/scholar/xpcom/ingester.js b/chrome/chromeFiles/content/scholar/xpcom/ingester.js
index 94d85e036..eb9fb270a 100644
--- a/chrome/chromeFiles/content/scholar/xpcom/ingester.js
+++ b/chrome/chromeFiles/content/scholar/xpcom/ingester.js
@@ -52,7 +52,6 @@ Scholar.Ingester.ProxyMonitor = new function() {
 					return;
 				}
 				
-				Scholar.debug(channel.URI.spec);
 				// We should be able to scrape the URL out of this
 				var m = _ezProxyRe.exec(channel.URI.spec);
 				if(!m) {
diff --git a/chrome/chromeFiles/content/scholar/itemTreeView.js b/chrome/chromeFiles/content/scholar/xpcom/itemTreeView.js
similarity index 97%
rename from chrome/chromeFiles/content/scholar/itemTreeView.js
rename to chrome/chromeFiles/content/scholar/xpcom/itemTreeView.js
index b236f86b7..eadf1d402 100644
--- a/chrome/chromeFiles/content/scholar/itemTreeView.js
+++ b/chrome/chromeFiles/content/scholar/xpcom/itemTreeView.js
@@ -214,9 +214,9 @@ Scholar.ItemTreeView.prototype.getCellText = function(row, column)
 	var obj = this._getItemAtRow(row);
 	var val;
 	
-	if(column.id == "numChildren")
+	if(column.id == "numNotes")
 	{
-		var c = obj.numChildren();
+		var c = obj.numNotes();
 		if(c)	//don't display '0'
 			val = c;
 	}
@@ -280,7 +280,7 @@ Scholar.ItemTreeView.prototype.isContainerOpen = function(row)
 
 Scholar.ItemTreeView.prototype.isContainerEmpty = function(row)
 {
-	return this._getItemAtRow(row).numChildren() == 0;
+	return (this._getItemAtRow(row).numNotes() == 0 && this._getItemAtRow(row).numAttachments() == 0);
 }
 
 Scholar.ItemTreeView.prototype.getLevel = function(row)
@@ -407,11 +407,11 @@ Scholar.ItemTreeView.prototype.sort = function()
 			return (typeA > typeB) ? -1 : (typeA < typeB) ? 1 : 0;
 		}
 	}
-	else if(column.id == 'numChildren')
+	else if(column.id == 'numNotes')
 	{
 		function columnSort(a,b)
 		{
-			return b.numChildren() - a.numChildren();
+			return b.numNotes() - a.numNotes();
 		}
 	}
 	else
@@ -775,10 +775,18 @@ Scholar.ItemTreeView.TreeRow.prototype.getType = function()
 	return this.ref.getType();
 }
 
-Scholar.ItemTreeView.TreeRow.prototype.numChildren = function()
+Scholar.ItemTreeView.TreeRow.prototype.numNotes = function()
 {
 	if(this.isRegularItem())
-		return this.ref.numChildren();
+		return this.ref.numNotes();
+	else
+		return 0;
+}
+
+Scholar.ItemTreeView.TreeRow.prototype.numAttachments = function()
+{
+	if(this.isRegularItem())
+		return this.ref.numAttachments();
 	else
 		return 0;
 }
\ No newline at end of file
diff --git a/chrome/chromeFiles/content/scholar/xpcom/scholar.js b/chrome/chromeFiles/content/scholar/xpcom/scholar.js
index b901b7822..e8f04c2a3 100644
--- a/chrome/chromeFiles/content/scholar/xpcom/scholar.js
+++ b/chrome/chromeFiles/content/scholar/xpcom/scholar.js
@@ -295,8 +295,10 @@ var Scholar = new function(){
 		
 		for (var i=0; i<args.length; i++){
 			if (typeof args[i]=='object'){
-				for (var j=0; j<args[i].length; j++){
-					returns.push(args[i][j]);
+				if(args[i]) {
+					for (var j=0; j<args[i].length; j++){
+						returns.push(args[i][j]);
+					}
 				}
 			}
 			else {
diff --git a/components/chnmIScholarService.js b/components/chnmIScholarService.js
index 19081d35e..bff51d75c 100644
--- a/components/chnmIScholarService.js
+++ b/components/chnmIScholarService.js
@@ -66,6 +66,22 @@ Cc["@mozilla.org/moz/jssubscript-loader;1"]
 	.getService(Ci.mozIJSSubScriptLoader)
 	.loadSubScript("chrome://scholar/content/xpcom/mime.js");
 
+Cc["@mozilla.org/moz/jssubscript-loader;1"]
+	.getService(Ci.mozIJSSubScriptLoader)
+	.loadSubScript("chrome://scholar/content/xpcom/itemTreeView.js");
+
+Cc["@mozilla.org/moz/jssubscript-loader;1"]
+	.getService(Ci.mozIJSSubScriptLoader)
+	.loadSubScript("chrome://scholar/content/xpcom/collectionTreeView.js");
+
+Cc["@mozilla.org/moz/jssubscript-loader;1"]
+	.getService(Ci.mozIJSSubScriptLoader)
+	.loadSubScript("chrome://global/content/nsTransferable.js");
+
+Cc["@mozilla.org/moz/jssubscript-loader;1"]
+	.getService(Ci.mozIJSSubScriptLoader)
+	.loadSubScript("chrome://global/content/nsDragAndDrop.js");
+
 /********************************************************************/