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

Merge branch 'arrix-child_textnodes' into develop

Browse Source
This commit is contained in:
Niklas von Hertzen 2013-08-04 14:36:55 +03:00
commit 877367d499
3 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -17,3 +17,4 @@ chromedriver.log
*.baseline
*.iml
.idea/
.DS_Store

8
src/Parse.js
View File

@ -1077,8 +1077,12 @@ _html2canvas.Parse = function (images, options) {
function init() {
var stack = renderElement(element, null);
Array.prototype.slice.call(element.children, 0).forEach(function(childElement) {
parseElement(childElement, stack);
_html2canvas.Util.Children(element).forEach(function(node) {
if (node.nodeType === 1) {
parseElement(node, stack);
} else if (node.nodeType === 3) {
renderText(element, node, stack);
}
});
stack.backgroundColor = getCSS(document.documentElement, "backgroundColor");

22
tests/cases/child-textnodes.html Normal file
View File

@ -0,0 +1,22 @@
<!DOCTYPE html>
<html>
<head>
<title>Inline text in the top element</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<script type="text/javascript" src="../test.js"></script>
<style>
span {
color:blue;
}
p {
background-color: green;
}
</style>
</head>
<body>
Some inline text <span> followed by text in span </span> followed by more inline text.
<p>Then a block level element.</p>
Then more inline text.
</body>
</html>