Skip to content

Commit 2e2d722

Browse files
committed
Fix rendering for safari 6
1 parent b9edf0b commit 2e2d722

File tree

6 files changed

+13
-4
lines changed

6 files changed

+13
-4
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "src/fabric"]
2+
path = src/fabric
3+
url = https://github.com/kangax/fabric.js.git

dist/html2canvas.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,12 @@ function renderDocument(document, options, windowWidth, windowHeight) {
7777
var parser = new NodeParser(node, renderer, support, imageLoader, options);
7878
return parser.ready.then(function() {
7979
log("Finished rendering");
80+
var canvas = (options.type !== "view" && (node === clonedWindow.document.body || node === clonedWindow.document.documentElement)) ? renderer.canvas : crop(renderer.canvas, bounds);
8081
if (options.removeContainer) {
8182
container.parentNode.removeChild(container);
83+
log("Cleaned up container");
8284
}
83-
return (options.type !== "view" && (node === clonedWindow.document.body || node === clonedWindow.document.documentElement)) ? renderer.canvas : crop(renderer.canvas, bounds);
85+
return canvas;
8486
});
8587
});
8688
}

dist/html2canvas.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/core.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,12 @@ function renderDocument(document, options, windowWidth, windowHeight) {
3838
var parser = new NodeParser(node, renderer, support, imageLoader, options);
3939
return parser.ready.then(function() {
4040
log("Finished rendering");
41+
var canvas = (options.type !== "view" && (node === clonedWindow.document.body || node === clonedWindow.document.documentElement)) ? renderer.canvas : crop(renderer.canvas, bounds);
4142
if (options.removeContainer) {
4243
container.parentNode.removeChild(container);
44+
log("Cleaned up container");
4345
}
44-
return (options.type !== "view" && (node === clonedWindow.document.body || node === clonedWindow.document.documentElement)) ? renderer.canvas : crop(renderer.canvas, bounds);
46+
return canvas;
4547
});
4648
});
4749
}

src/fabric

Submodule fabric added at 791c74a

src/fabric.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit 791c74a82ef0d838fd0bd81bf942f8630a9a4a8f

0 commit comments

Comments
 (0)