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

Correctly use native rendering with inline <svg> nodes if possible

Browse Source
This commit is contained in:
Niklas von Hertzen
2014-09-20 20:21:25 +03:00
parent 70241a789d
commit 0a7df6d9b9
6 changed files with 52 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dist/html2canvas.js vendored
View File

@ -931,7 +931,7 @@ ImageLoader.prototype.loadImage = function(imageData) {
} else if (imageData.method === "gradient") {
return new WebkitGradientContainer(imageData);
} else if (imageData.method === "svg") {
return new SVGNodeContainer(imageData.args[0]);
return new SVGNodeContainer(imageData.args[0], this.support.svg);
} else if (imageData.method === "IFRAME") {
return new FrameContainer(imageData.args[0], this.isSameOrigin(imageData.args[0].src), this.options.proxy);
} else {
@ -2498,12 +2498,20 @@ function decode64(base64) {
return output;
}
function SVGNodeContainer(node) {
function SVGNodeContainer(node, native) {
this.src = node;
this.image = null;
var self = this;
this.promise = this.hasFabric().then(function() {
this.promise = native ? new Promise(function(resolve, reject) {
self.image = new Image();
self.image.onload = resolve;
self.image.onerror = reject;
self.image.src = "data:image/svg+xml," + (new XMLSerializer()).serializeToString(node);
if (self.image.complete === true) {
resolve(self.image);
}
}) : this.hasFabric().then(function() {
return new Promise(function(resolve) {
html2canvas.fabric.parseSVGDocument(node, self.createCanvas.call(self, resolve));
});

4
dist/html2canvas.min.js vendored
View File

File diff suppressed because one or more lines are too long