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

fix ie 9 bug

Browse Source
This commit is contained in:
Niklas von Hertzen 2012-12-27 23:06:35 +02:00
parent 5198028c7b
commit 4684177df8
4 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Parse.js
View File

@ -274,7 +274,9 @@ _html2canvas.Parse = function (images, options) {
text_align = text_align.replace(["-webkit-auto"],["auto"]); text_align = text_align.replace(["-webkit-auto"],["auto"]);
renderList = (!options.letterRendering && /^(left|right|justify|auto)$/.test(text_align) && noLetterSpacing(letter_spacing)) ? textNode.nodeValue.split(/(\b| )/) : textNode.nodeValue.split(""); renderList = (!options.letterRendering && /^(left|right|justify|auto)$/.test(text_align) && noLetterSpacing(letter_spacing))
? textNode.nodeValue.split(/(\b| )/)
: textNode.nodeValue.split("");
metrics = setTextVariables(ctx, el, text_decoration, color); metrics = setTextVariables(ctx, el, text_decoration, color);
oldTextNode = textNode; oldTextNode = textNode;
@ -307,7 +309,7 @@ _html2canvas.Parse = function (images, options) {
// it isn't supported, so let's wrap it inside an element instead and get the bounds there // it isn't supported, so let's wrap it inside an element instead and get the bounds there
// IE 9 bug // IE 9 bug
if (typeof oldTextNode.nodeValue !== "string" ){ if (!oldTextNode || typeof oldTextNode.nodeValue !== "string" ){
continue; continue;
} }
@ -326,7 +328,6 @@ _html2canvas.Parse = function (images, options) {
oldTextNode = newTextNode; oldTextNode = newTextNode;
parent.replaceChild(backupText, wrapElement); parent.replaceChild(backupText, wrapElement);
} }
if (textValue !== null) { if (textValue !== null) {
@ -1002,25 +1003,22 @@ _html2canvas.Parse = function (images, options) {
// skip hidden elements and their children // skip hidden elements and their children
if (getCSS(el, 'display') !== "none" && getCSS(el, 'visibility') !== "hidden" && !el.hasAttribute("data-html2canvas-ignore")) { if (getCSS(el, 'display') !== "none" && getCSS(el, 'visibility') !== "hidden" && !el.hasAttribute("data-html2canvas-ignore")) {
stack = renderElement(el, stack) || stack; stack = renderElement(el, stack) || stack;
ctx = stack.ctx; ctx = stack.ctx;
if ( !ignoreElementsRegExp.test( el.nodeName ) ) { if (!ignoreElementsRegExp.test(el.nodeName)) {
var elementChildren = _html2canvas.Util.Children( el ), var elementChildren = _html2canvas.Util.Children(el),
i, i,
node, node,
childrenLen; childrenLen;
for (i = 0, childrenLen = elementChildren.length; i < childrenLen; i+=1) { for (i = 0, childrenLen = elementChildren.length; i < childrenLen; i+=1) {
node = elementChildren[i]; node = elementChildren[i];
if (node.nodeType === 1) {
if ( node.nodeType === 1 ) {
parseElement(node, stack); parseElement(node, stack);
}else if ( node.nodeType === 3 ) { } else if (node.nodeType === 3) {
renderText(el, node, stack); renderText(el, node, stack);
} }
} }
} }
@ -1081,7 +1079,7 @@ _html2canvas.Parse = function (images, options) {
} }
parseDOM( body ); parseDOM(body);
img.src = [ img.src = [
"data:image/svg+xml,", "data:image/svg+xml,",
"<svg xmlns='http://www.w3.org/2000/svg' version='1.1' width='" + size.width + "' height='" + size.height + "'>", "<svg xmlns='http://www.w3.org/2000/svg' version='1.1' width='" + size.width + "' height='" + size.height + "'>",
@ -1093,14 +1091,11 @@ _html2canvas.Parse = function (images, options) {
"</svg>" "</svg>"
].join(""); ].join("");
img.onload = function() { img.onload = function() {
stack.svgRender = img; stack.svgRender = img;
}; };
})( document.documentElement ); })(document.documentElement);
} }
@ -1110,8 +1105,7 @@ _html2canvas.Parse = function (images, options) {
parseElement(children[i], stack); parseElement(children[i], stack);
} }
stack.backgroundColor = getCSS(document.documentElement, "backgroundColor");
stack.backgroundColor = getCSS( document.documentElement, "backgroundColor" );
return stack; return stack;

0
tests/forms.html → tests/cases/forms.html
View File

0
tests/text-linethrough.html → tests/cases/text/linethrough.html
View File

0
tests/text-underline.html → tests/cases/text/underline.html
View File