Merge branch 'patch-2' of github.com:brcontainer/html2canvas into brcontainer-patch-2

This commit is contained in:
Niklas von Hertzen 2013-12-23 15:32:18 +02:00
commit e228fc57ce

View File

@ -250,6 +250,13 @@ _html2canvas.Util.getCSS = function (element, attribute, index) {
}
var value = computedCSS[attribute];
if(attribute==="backgroundRepeat" && value.indexOf(" ")!==-1){
value = (
"no-repeat repeat"===value ? "repeat-y" : (
"repeat no-repeat"===value ? "repeat-x" : value
)
);
}
if (/^background(Size|Position)$/.test(attribute)) {
return parseBackgroundSizePosition(value, element, attribute, index);
@ -406,4 +413,4 @@ _html2canvas.Util.Children = function( elem ) {
_html2canvas.Util.isTransparent = function(backgroundColor) {
return (!backgroundColor || backgroundColor === "transparent" || backgroundColor === "rgba(0, 0, 0, 0)");
};
};