www

commit 63f346b504b7904f1e0e1026d1d1f29610bf64c7
parent fe37dc73e197308166f8fae02075515dca9d5f99
Author: Simon Kornblith <simon@simonster.com>
Date:   Sun,  1 Aug 2010 20:34:29 +0000

closes #1609, Bibliography printing broken

this currently leaks a hidden browser object, since deleting it seems to cause the print command to fail. this may not be a big issue, since this feature is used so rarely anyways...


Diffstat:
M
chrome/content/zotero/fileInterface.js
 | 
55
+++++++++++++++++++++++++++++++------------------------

1 file changed, 31 insertions(+), 24 deletions(-)
diff --git a/chrome/content/zotero/fileInterface.js b/chrome/content/zotero/fileInterface.js
@@ -493,33 +493,40 @@ var Zotero_File_Interface = new function() {
 		if(io.output == "print") {
 			// printable bibliography, using a hidden browser
 			var browser = Zotero.Browser.createHiddenBrowser(window);
-			browser.contentDocument.write(bibliography);
-			browser.contentDocument.close();
 			
-			// this is kinda nasty, but we have to temporarily modify the user's
-			// settings to eliminate the header and footer. the other way to do
-			// this would be to attempt to print with an embedded browser, but
-			// it's not even clear how to attempt to create one
-			var prefService = Components.classes["@mozilla.org/preferences-service;1"].
-			                  getService(Components.interfaces.nsIPrefBranch);
-			var prefsToClear = ["print.print_headerleft", "print.print_headercenter", 
-			                    "print.print_headerright", "print.print_footerleft", 
-			                    "print.print_footercenter", "print.print_footerright"];
-			var oldPrefs = new Array();
-			for(var i in prefsToClear) {
-				oldPrefs[i] = prefService.getCharPref(prefsToClear[i]);
-				prefService.setCharPref(prefsToClear[i], "");
-			}
-			
-			// print
-			browser.contentWindow.print();
-			
-			// set the prefs back
-			for(var i in prefsToClear) {
-				prefService.setCharPref(prefsToClear[i], oldPrefs[i]);
+			var listener = function() {
+				if(browser.contentDocument.location.href == "about:blank") return;
+				browser.removeEventListener("pageshow", listener, false);
+				
+				// this is kinda nasty, but we have to temporarily modify the user's
+				// settings to eliminate the header and footer. the other way to do
+				// this would be to attempt to print with an embedded browser, but
+				// it's not even clear how to attempt to create one
+				var prefService = Components.classes["@mozilla.org/preferences-service;1"].
+								  getService(Components.interfaces.nsIPrefBranch);
+				var prefsToClear = ["print.print_headerleft", "print.print_headercenter", 
+									"print.print_headerright", "print.print_footerleft", 
+									"print.print_footercenter", "print.print_footerright"];
+				var oldPrefs = [];
+				for(var i in prefsToClear) {
+					oldPrefs[i] = prefService.getCharPref(prefsToClear[i]);
+					prefService.setCharPref(prefsToClear[i], "");
+				}
+				
+				// print
+				browser.contentWindow.print();
+				
+				// set the prefs back
+				for(var i in prefsToClear) {
+					prefService.setCharPref(prefsToClear[i], oldPrefs[i]);
+				}
+				
+				// TODO can't delete hidden browser object here or else print will fail...
 			}
 			
-			Zotero.Browser.deleteHiddenBrowser(browser);
+			browser.addEventListener("pageshow", listener, false);
+			browser.loadURIWithFlags("data:text/html;charset=utf-8,"+encodeURI(bibliography),
+				Components.interfaces.nsIWebNavigation.LOAD_FLAGS_BYPASS_HISTORY, null, "utf-8", null);
 		} else if(io.output == "save-as-html") {
 			var fStream = _saveBibliography(name, "HTML");