mirror/html2canvas
1
0
Fork 0
mirror of https://github.com/niklasvh/html2canvas.git synced 2023-08-10 21:13:10 +03:00
Code Issues Projects Releases Wiki Activity

fix image loaded through the proxy hanging the preload process

Browse Source 
images loaded through the proxy could hang the preload process if
they finish loading through the proxy but then fail to decode
and thus don't call the onload handler of the image object.
This commit is contained in:
Obexer Christoph 2012-02-12 23:33:13 +01:00
parent e925719151
commit afc358fb12
1 changed files with 39 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/Preload.js
View File

@ -61,17 +61,16 @@ html2canvas.Preload = function(element, opts){
}
}
function proxyGetImage(url, img){
function proxyGetImage(url, img, imageObj){
var callback_name,
scriptUrl = options.proxy,
script,
imgObj = images[url];
script;
link.href = url;
url = link.href; // work around for pages with base href="" set - WARNING: this may change the url -> so access imgObj from images map before changing that url!
url = link.href; // work around for pages with base href="" set - WARNING: this may change the url
callback_name = 'html2canvas_' + count;
imgObj.callbackname = callback_name;
callback_name = 'html2canvas_' + (count++);
imageObj.callbackname = callback_name;
if (scriptUrl.indexOf("?") > -1) {
scriptUrl += "&";
@ -79,19 +78,16 @@ html2canvas.Preload = function(element, opts){
scriptUrl += "?";
}
scriptUrl += 'url=' + encodeURIComponent(url) + '&callback=' + callback_name;
script = doc.createElement("script");
window[callback_name] = function(a){
if (a.substring(0,6) === "error:"){
imgObj.succeeded = false;
imageObj.succeeded = false;
images.numLoaded++;
images.numFailed++;
start();
} else {
img.onload = function(){
imgObj.succeeded = true;
images.numLoaded++;
start();
};
setImageLoadHandlers(img, imageObj);
img.src = a;
}
window[callback_name] = undefined; // to work with IE<9 // NOTE: that the undefined callback property-name still exists on the window object (for IE<9)
@ -100,15 +96,13 @@ html2canvas.Preload = function(element, opts){
} catch(ex) {}
script.parentNode.removeChild(script);
script = null;
imgObj.callbackname = undefined;
delete imageObj.script;
delete imageObj.callbackname;
};
count += 1;
script = doc.createElement("script");
script.setAttribute("src", scriptUrl);
script.setAttribute("type", "text/javascript");
imgObj.script = script;
script.setAttribute("src", scriptUrl);
imageObj.script = script;
window.document.body.appendChild(script);
/*
@ -219,54 +213,41 @@ html2canvas.Preload = function(element, opts){
}
}
methods = {
loadImage: function( src ) {
var img;
if ( src && images[src] === undefined ) {
if ( src.match(/data:image\/.*;base64,/i) ) {
//Base64 src
img = new Image();
img.src = src.replace(/url\(['"]{0,}|['"]{0,}\)$/ig, '');
images[src] = {
img: img,
succeeded: true
};
images.numTotal++;
images.numLoaded++;
start();
}else if ( isSameOrigin( src ) ) {
img = new Image();
images[src] = {
img: img
};
images.numTotal++;
function setImageLoadHandlers(img, imageObj) {
img.onload = function() {
images.numLoaded++;
images[src].succeeded = true;
imageObj.succeeded = true;
start();
};
img.onerror = function() {
images.numLoaded++;
images.numFailed++;
images[src].succeeded = false;
imageObj.succeeded = false;
start();
};
}
img.src = src;
}else if ( options.proxy ){
// console.log('b'+src);
methods = {
loadImage: function( src ) {
var img, imageObj;
if ( src && images[src] === undefined ) {
img = new Image();
images[src] = {
img: img
};
if ( src.match(/data:image\/.*;base64,/i) ) {
img.src = src.replace(/url\(['"]{0,}|['"]{0,}\)$/ig, '');
imageObj = images[src] = { img: img };
images.numTotal++;
proxyGetImage( src, img );
setImageLoadHandlers(img, imageObj);
}
else if ( isSameOrigin( src ) ) {
imageObj = images[src] = { img: img };
images.numTotal++;
setImageLoadHandlers(img, imageObj);
img.src = src;
}
else if ( options.proxy ) {
imageObj = images[src] = { img: img };
images.numTotal++;
proxyGetImage( src, img, imageObj );
}
}
@ -326,7 +307,6 @@ html2canvas.Preload = function(element, opts){
if (options.timeout > 0) {
timeoutTimer = window.setTimeout(methods.cleanupDOM, options.timeout);
}
var startTime = (new Date()).getTime();
html2canvas.log('html2canvas: Preload starts: finding background-images');
images.firstRun = true;