mirror of
https://github.com/niklasvh/html2canvas.git
synced 2023-08-10 21:13:10 +03:00
Add atob polyfill for ie9 for SVG base64 rendering
This commit is contained in:
parent
36052c2765
commit
0325a9b836
43
dist/html2canvas.js
vendored
43
dist/html2canvas.js
vendored
@ -312,7 +312,7 @@ ImageLoader.prototype.addImage = function(images, callback) {
|
||||
newImage.args.forEach(function(image) {
|
||||
if (!this.imageExists(images, image)) {
|
||||
images.splice(0, 0, callback.call(this, newImage));
|
||||
log('Added image #' + (images.length), image);
|
||||
log('Added image #' + (images.length), typeof(image) === "string" ? image.substring(0, 100) : image);
|
||||
}
|
||||
}, this);
|
||||
};
|
||||
@ -1793,7 +1793,7 @@ SVGContainer.prototype.hasFabric = function() {
|
||||
};
|
||||
|
||||
SVGContainer.prototype.inlineFormatting = function(src) {
|
||||
return (/^data:image\/svg\+xml;base64,/.test(src)) ? window.atob(this.removeContentType(src)) : this.removeContentType(src);
|
||||
return (/^data:image\/svg\+xml;base64,/.test(src)) ? this.decode64(this.removeContentType(src)) : this.removeContentType(src);
|
||||
};
|
||||
|
||||
SVGContainer.prototype.removeContentType = function(src) {
|
||||
@ -1818,6 +1818,45 @@ SVGContainer.prototype.createCanvas = function(resolve) {
|
||||
};
|
||||
};
|
||||
|
||||
SVGContainer.prototype.decode64 = function(str) {
|
||||
return (typeof(window.atob) === "function") ? window.atob(str) : decode64(str);
|
||||
};
|
||||
|
||||
/*
|
||||
* base64-arraybuffer
|
||||
* https://github.com/niklasvh/base64-arraybuffer
|
||||
*
|
||||
* Copyright (c) 2012 Niklas von Hertzen
|
||||
* Licensed under the MIT license.
|
||||
*/
|
||||
|
||||
function decode64(base64) {
|
||||
var chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||
var len = base64.length, i, encoded1, encoded2, encoded3, encoded4, byte1, byte2, byte3;
|
||||
|
||||
var output = "";
|
||||
|
||||
for (i = 0; i < len; i+=4) {
|
||||
encoded1 = chars.indexOf(base64[i]);
|
||||
encoded2 = chars.indexOf(base64[i+1]);
|
||||
encoded3 = chars.indexOf(base64[i+2]);
|
||||
encoded4 = chars.indexOf(base64[i+3]);
|
||||
|
||||
byte1 = (encoded1 << 2) | (encoded2 >> 4);
|
||||
byte2 = ((encoded2 & 15) << 4) | (encoded3 >> 2);
|
||||
byte3 = ((encoded3 & 3) << 6) | encoded4;
|
||||
if (encoded3 === 64) {
|
||||
output += String.fromCharCode(byte1);
|
||||
} else if (encoded4 === 64 || encoded4 === -1) {
|
||||
output += String.fromCharCode(byte1, byte2);
|
||||
} else{
|
||||
output += String.fromCharCode(byte1, byte2, byte3);
|
||||
}
|
||||
}
|
||||
|
||||
return output;
|
||||
}
|
||||
|
||||
function SVGNodeContainer(node) {
|
||||
this.src = node;
|
||||
this.image = null;
|
||||
|
4
dist/html2canvas.min.js
vendored
4
dist/html2canvas.min.js
vendored
File diff suppressed because one or more lines are too long
@ -22,7 +22,7 @@ ImageLoader.prototype.addImage = function(images, callback) {
|
||||
newImage.args.forEach(function(image) {
|
||||
if (!this.imageExists(images, image)) {
|
||||
images.splice(0, 0, callback.call(this, newImage));
|
||||
log('Added image #' + (images.length), image);
|
||||
log('Added image #' + (images.length), typeof(image) === "string" ? image.substring(0, 100) : image);
|
||||
}
|
||||
}, this);
|
||||
};
|
||||
|
@ -17,7 +17,7 @@ SVGContainer.prototype.hasFabric = function() {
|
||||
};
|
||||
|
||||
SVGContainer.prototype.inlineFormatting = function(src) {
|
||||
return (/^data:image\/svg\+xml;base64,/.test(src)) ? window.atob(this.removeContentType(src)) : this.removeContentType(src);
|
||||
return (/^data:image\/svg\+xml;base64,/.test(src)) ? this.decode64(this.removeContentType(src)) : this.removeContentType(src);
|
||||
};
|
||||
|
||||
SVGContainer.prototype.removeContentType = function(src) {
|
||||
@ -41,3 +41,42 @@ SVGContainer.prototype.createCanvas = function(resolve) {
|
||||
resolve(canvas.lowerCanvasEl);
|
||||
};
|
||||
};
|
||||
|
||||
SVGContainer.prototype.decode64 = function(str) {
|
||||
return (typeof(window.atob) === "function") ? window.atob(str) : decode64(str);
|
||||
};
|
||||
|
||||
/*
|
||||
* base64-arraybuffer
|
||||
* https://github.com/niklasvh/base64-arraybuffer
|
||||
*
|
||||
* Copyright (c) 2012 Niklas von Hertzen
|
||||
* Licensed under the MIT license.
|
||||
*/
|
||||
|
||||
function decode64(base64) {
|
||||
var chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||
var len = base64.length, i, encoded1, encoded2, encoded3, encoded4, byte1, byte2, byte3;
|
||||
|
||||
var output = "";
|
||||
|
||||
for (i = 0; i < len; i+=4) {
|
||||
encoded1 = chars.indexOf(base64[i]);
|
||||
encoded2 = chars.indexOf(base64[i+1]);
|
||||
encoded3 = chars.indexOf(base64[i+2]);
|
||||
encoded4 = chars.indexOf(base64[i+3]);
|
||||
|
||||
byte1 = (encoded1 << 2) | (encoded2 >> 4);
|
||||
byte2 = ((encoded2 & 15) << 4) | (encoded3 >> 2);
|
||||
byte3 = ((encoded3 & 3) << 6) | encoded4;
|
||||
if (encoded3 === 64) {
|
||||
output += String.fromCharCode(byte1);
|
||||
} else if (encoded4 === 64 || encoded4 === -1) {
|
||||
output += String.fromCharCode(byte1, byte2);
|
||||
} else{
|
||||
output += String.fromCharCode(byte1, byte2, byte3);
|
||||
}
|
||||
}
|
||||
|
||||
return output;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user