From dff5dab161da51c9103461c15d7e35116a0c6e2f Mon Sep 17 00:00:00 2001 From: MoyuScript Date: Wed, 23 Nov 2011 14:06:00 +0100 Subject: [PATCH] accessing nodeType may throw an exception --- src/Preload.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/Preload.js b/src/Preload.js index 878cdf1..03fab51 100644 --- a/src/Preload.js +++ b/src/Preload.js @@ -156,7 +156,8 @@ html2canvas.Preload = function(element, opts){ contentsLen = contents.length, background_image, src, - img; + img, + elNodeType = false; for (i = 0; i < contentsLen; i+=1 ){ // var ignRe = new RegExp("("+this.ignoreElements+")"); @@ -166,8 +167,14 @@ html2canvas.Preload = function(element, opts){ } // } - - if (el.nodeType === 1 || el.nodeType === undefined){ + try { + elNodeType = el.nodeType; + } catch (ex) { + elNodeType = false; + html2canvas.log("html2canvas: failed to access some element's nodeType - Exception: " + ex.message); + } + + if (elNodeType === 1 || elNodeType === undefined){ background_image = html2canvas.Util.getCSS(el, 'backgroundImage');