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

Don't fail on broken images

Browse Source
This commit is contained in:
MoyuScript
2014-03-15 13:20:05 +02:00
parent 6e1baa3e25
commit 73266849b4
5 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/dummyimagecontainer.js Normal file
View File

@ -0,0 +1,17 @@
function DummyImageContainer(src) {
this.src = src;
log("DummyImageContainer for", src);
if (!this.promise || !this.image) {
log("Initiating DummyImageContainer");
DummyImageContainer.prototype.image = new Image();
var image = this.image;
DummyImageContainer.prototype.promise = new Promise(function(resolve, reject) {
image.onload = resolve;
image.onerror = reject;
image.src = smallImage();
if (image.complete === true) {
resolve(image);
}
});
}
}

19
src/imagecontainer.js
View File

@ -1,16 +1,21 @@
function ImageContainer(src, cors) {
this.src = src;
this.image = new Image();
var image = this.image;
var self = this;
this.promise = new Promise(function(resolve, reject) {
image.onload = resolve;
image.onerror = reject;
self.image.onload = resolve;
self.image.onerror = reject;
if (cors) {
image.crossOrigin = "anonymous";
self.image.crossOrigin = "anonymous";
}
image.src = src;
if (image.complete === true) {
resolve(image);
self.image.src = src;
if (self.image.complete === true) {
resolve(self.image);
}
})['catch'](function() {
var dummy = new DummyImageContainer(src);
return dummy.promise.then(function(image) {
self.image = image;
});
});
}

13
src/proxyimagecontainer.js
View File

@ -7,16 +7,16 @@ function ProxyImageContainer(src, proxy) {
var requestUrl = proxy + ((proxy.indexOf("?") > -1) ? "&" : "?" ) + 'url=' + encodeURIComponent(src) + '&callback=' + callbackName;
this.src = src;
this.image = new Image();
var image = this.image;
var self = this;
this.promise = new Promise(function(resolve, reject) {
image.onload = resolve;
image.onerror = reject;
self.image.onload = resolve;
self.image.onerror = reject;
window[callbackName] = function(a){
if (a.substring(0,6) === "error:"){
reject();
} else {
image.src = a;
self.image.src = a;
}
window[callbackName] = undefined; // to work with IE<9 // NOTE: that the undefined callback property-name still exists on the window object (for IE<9)
try {
@ -27,6 +27,11 @@ function ProxyImageContainer(src, proxy) {
script.setAttribute("type", "text/javascript");
script.setAttribute("src", requestUrl);
document.body.appendChild(script);
})['catch'](function() {
var dummy = new DummyImageContainer(src);
return dummy.promise.then(function(image) {
self.image = image;
});
});
}