www

commit ed6650c4e7a40bab6c44bcad6926c91c1d961c50
parent 10f4b28c63c4a3b8bbc3e059a2adc33f7eb1af8e
Author: Simon Kornblith <simon@simonster.com>
Date:   Mon,  4 Sep 2006 08:06:04 +0000

closes #218, Windows support for Word integration. this solution seems to work with both Word 2003 and Word 2007. i have not tested with earlier versions. Zotero.dot is the Windows verison; Zotero.dot.dmg is the Mac version. the only difference is the function call used to perform SOAP requests.

to get this to work right, you'll need the SOAP toolkit from http://www.microsoft.com/downloads/details.aspx?FamilyID=ba611554-5943-444c-b53c-c0a450b7013c&DisplayLang=en
I may replace the SOAP object with a simple XMLHTTP object, since that page says that the SOAP toolkit is deprecated.


Diffstat:
A
Zotero.dot
 | 
0

M
chrome/chromeFiles/content/scholar/bibliography.js
 | 
7
+++++++
M
chrome/chromeFiles/content/scholar/ingester/browser.js
 | 
2
+-
M
chrome/chromeFiles/content/scholar/selectItemsDialog.js
 | 
7
+++++++
M
chrome/chromeFiles/content/scholar/xpcom/integration.js
 | 
7
++++---
M
scrapers.sql
 | 
2
+-

6 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/Zotero.dot b/Zotero.dot
Binary files differ.
diff --git a/chrome/chromeFiles/content/scholar/bibliography.js b/chrome/chromeFiles/content/scholar/bibliography.js
@@ -43,6 +43,13 @@ var Scholar_File_Interface_Bibliography = new function() {
 		if(Scholar.isMac && document.getElementById("copy-to-clipboard")) {
 			document.getElementById("copy-to-clipboard").hidden = "true";
 		}
+		
+		// move to center of screen
+		window.sizeToContent();
+		window.moveTo(
+			(self.screen.width-window.innerWidth)/2,
+			(self.screen.height-window.innerHeight)/2
+		);
 	}
 
 	function acceptSelection() {
diff --git a/chrome/chromeFiles/content/scholar/ingester/browser.js b/chrome/chromeFiles/content/scholar/ingester/browser.js
@@ -458,7 +458,7 @@ Scholar_Ingester_Interface.Progress = new function() {
 		_progressWindow.sizeToContent();
 		_progressWindow.moveTo(
 			window.screenX + window.outerWidth - _progressWindow.outerWidth - 30,
-			window.screenY + window.outerHeight - _progressWindow.outerHeight
+			window.screenY + window.outerHeight - _progressWindow.outerHeight - 10
 		);
 	}
 	
diff --git a/chrome/chromeFiles/content/scholar/selectItemsDialog.js b/chrome/chromeFiles/content/scholar/selectItemsDialog.js
@@ -14,6 +14,13 @@ function doLoad()
 	
 	collectionsView = new Scholar.CollectionTreeView();
 	document.getElementById('collections-tree').view = collectionsView;
+
+	// move to center of screen
+	window.sizeToContent()
+	window.moveTo(
+		(self.screen.width-window.innerWidth)/2,
+		(self.screen.height-window.innerHeight)/2
+	);
 }
 
 function doUnload()
diff --git a/chrome/chromeFiles/content/scholar/xpcom/integration.js b/chrome/chromeFiles/content/scholar/xpcom/integration.js
@@ -337,7 +337,7 @@ Scholar.Integration.SOAP = new function() {
 			// get items		
 			var io = {dataIn: null, dataOut: null};
 			window.openDialog('chrome://scholar/content/selectItemsDialog.xul','',
-								'chrome,popup,modal,centerscreen',io);
+								'chrome,popup,modal',io);
 
 			if(io.dataOut) {	// cancel was not pressed
 				var field = (io.dataOut.join(","))+"_"+Scholar.randomString();
@@ -451,20 +451,21 @@ Scholar.Integration.SOAP = new function() {
 	function setDocPrefs(vars) {
 		var io = new Object();
 		
-		if(!vars || vars[0] == "!") {
+		if(!vars || !vars[0] || vars[0] == "!") {
 			// no session ID; generate a new one
 			var sessionID = Scholar.randomString();
 			var session = _generateSession(sessionID);
 		} else {
 			// session ID exists
 			var sessionID = vars[0];
+			Scholar.debug(vars.toSource());
 			var session = _sessions[sessionID];
 			var originalStyle = session.styleID;
 			io.style = originalStyle;
 		}
 		
 		window.openDialog('chrome://scholar/content/integrationDocPrefs.xul','',
-		                    'chrome,popup,modal,centerscreen',io);
+		                    'chrome,popup,modal',io);
 		session.styleID = io.style;
 		var style = Scholar.Cite.getStyle(io.style);
 		
diff --git a/scrapers.sql b/scrapers.sql
@@ -1,4 +1,4 @@
--- 71
+-- 72
 
 -- Set the following timestamp to the most recent scraper update date
 REPLACE INTO "version" VALUES ('repository', STRFTIME('%s', '2006-08-31 22:44:00'));