From ed6650c4e7a40bab6c44bcad6926c91c1d961c50 Mon Sep 17 00:00:00 2001 From: Simon Kornblith Date: Mon, 4 Sep 2006 08:06:04 +0000 Subject: [PATCH] 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. --- Zotero.dot | Bin 0 -> 81408 bytes .../chromeFiles/content/scholar/bibliography.js | 7 +++++++ .../content/scholar/ingester/browser.js | 2 +- .../content/scholar/selectItemsDialog.js | 7 +++++++ .../content/scholar/xpcom/integration.js | 7 ++++--- scrapers.sql | 2 +- 6 files changed, 20 insertions(+), 5 deletions(-) create mode 100755 Zotero.dot diff --git a/Zotero.dot b/Zotero.dot new file mode 100755 index 0000000000000000000000000000000000000000..665544e9f8c7d6430eb89647760e138c77f8badc GIT binary patch literal 81408 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 literal 0 HcmV?d00001 diff --git a/chrome/chromeFiles/content/scholar/bibliography.js b/chrome/chromeFiles/content/scholar/bibliography.js index 8418d1b649..7d692ad53a 100644 --- 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 index ee8a26c807..f3d473577b 100644 --- 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 index 76e194e5f2..76c357185d 100644 --- 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 index 3f29da44e1..199760019f 100644 --- 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 index d29ca7b818..0512d709e7 100644 --- 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'));