www

commit fc078caddff68dba33d05182bc8f9619b9b96ad9
parent 9b629373617c5c3294f5cf6981dcb390c4283ac5
Author: Simon Kornblith <simon@simonster.com>
Date:   Fri, 17 Jun 2011 21:25:05 +0000

Addresses #1829: [PATCH] wpdDOMSaver fails due to undefined Zotero

Removes calls to Zotero object, since they are unnecessary (the call that was problematic was a workaround for a Fx 4 beta crashing bug).


Diffstat:
M
chrome/content/zotero/webpagedump/domsaver.js
 | 
16
+++++++---------

1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/chrome/content/zotero/webpagedump/domsaver.js b/chrome/content/zotero/webpagedump/domsaver.js
@@ -296,14 +296,12 @@ var wpdDOMSaver = {
       aNode.StopPlay();                   
       dump ("ready! \n");
     } catch (e) {}     */
-	if(!Zotero.isFx4) {
-		try {  
-			var container = aNode.QueryInterface(Components.interfaces.nsIImageLoadingContent)
-					  .getRequest(Components.interfaces.nsIImageLoadingContent.CURRENT_REQUEST)
-					  .image;
-			container.animationMode = Components.interfaces.imgIContainer.kDontAnimMode;
-		} catch(e) {}
-	}
+	try {  
+		var container = aNode.QueryInterface(Components.interfaces.nsIImageLoadingContent)
+				  .getRequest(Components.interfaces.nsIImageLoadingContent.CURRENT_REQUEST)
+				  .image;
+		container.animationMode = Components.interfaces.imgIContainer.kDontAnimMode;
+	} catch(e) {}
   },            
 
   // get the node value of aNode directly from the actual DOM tree (WPD_CLONENODEBUG)
@@ -654,7 +652,7 @@ var wpdDOMSaver = {
 		catch (e) {
 			var msg = "Unable to access cssRules property of " + aCSS.href
 				+ " in wpdDOMSaver.processCSSRecursively()";
-			Zotero.debug(msg, 2);
+			dump("WebPageDump: "+msg+"\n\n", 2);
 			Components.utils.reportError(msg);
 			return "";
 		}