fixed firefox iframe permission error

This commit is contained in:
Niklas von Hertzen 2012-06-26 01:30:45 +03:00
parent 343b86705f
commit 1ba911912d

View File

@ -111,18 +111,23 @@ _html2canvas.Preload = function( options ) {
var contents = _html2canvas.Util.Children(el), var contents = _html2canvas.Util.Children(el),
i, i,
contentsLen = contents.length,
background_image, background_image,
src, src,
img, img,
elNodeType = false; elNodeType = false;
// Firefox fails with permission denied on pages with iframes
try {
var contentsLen = contents.length;
for (i = 0; i < contentsLen; i+=1 ){ for (i = 0; i < contentsLen; i+=1 ){
// var ignRe = new RegExp("("+this.ignoreElements+")"); // var ignRe = new RegExp("("+this.ignoreElements+")");
// if (!ignRe.test(element.nodeName)){ // if (!ignRe.test(element.nodeName)){
getImages(contents[i]); getImages(contents[i]);
// } // }
} }
}
catch( e ) {}
// } // }
try { try {
@ -145,7 +150,6 @@ _html2canvas.Preload = function( options ) {
// TODO add multi image background support // TODO add multi image background support
if (/^(-webkit|-o|-moz|-ms|linear)-/.test( background_image )) { if (/^(-webkit|-o|-moz|-ms|linear)-/.test( background_image )) {
// if (background_image.substring(0,7) === "-webkit" || background_image.substring(0,3) === "-o-" || background_image.substring(0,4) === "-moz") {
img = _html2canvas.Generate.Gradient( background_image, _html2canvas.Util.Bounds( el ) ); img = _html2canvas.Generate.Gradient( background_image, _html2canvas.Util.Bounds( el ) );