www

commit 55d9d4ba51897345f7ba47ad766f87b72d505503
parent 5f0f86fab9a27501a07fe25c57a7256257daf5e6
Author: Simon Kornblith <simon@simonster.com>
Date:   Tue, 11 Dec 2012 21:30:29 -0800

Merge pull request #210 from aurimasv/wdp-css

[WebPageDump] Don't crash when @import stylesheets are null
Diffstat:
M
chrome/content/zotero/webpagedump/domsaver.js
 | 
7
++++---

1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/chrome/content/zotero/webpagedump/domsaver.js b/chrome/content/zotero/webpagedump/domsaver.js
@@ -633,7 +633,7 @@ var wpdDOMSaver = {
 	// FONT_FACE_RULE = 5,
 	// PAGE_RULE = 6
 	processCSSRecursively: function (aCSS) {
-		if (aCSS.disabled) return "";
+		if (!aCSS || aCSS.disabled) return "";
 		var content = "";
 		var medium = aCSS.media.mediaText;
 		if (medium != "" && medium.indexOf("screen") < 0 && medium.indexOf("all") < 0) {
@@ -966,8 +966,9 @@ var wpdDOMSaver = {
 		if (this.option["format"]) {
 			var myStyleSheets = aDocument.styleSheets;
 			// get all style sheets to "CSSText"
-			for (var i = 0; i < myStyleSheets.length; i++)
-			CSSText += this.processCSSRecursively(myStyleSheets[i]);
+			for (var i = 0; i < myStyleSheets.length; i++) {
+				CSSText += this.processCSSRecursively(myStyleSheets[i]);
+			}
 			if (CSSText) {
 				// don't forget to convert the CSS String to the document charset..
 				// (necessary for e.g. font-family)