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

moved border drawing to Borders.js

Browse Source
This commit is contained in:
Niklas von Hertzen 2011-07-18 13:17:45 +03:00
parent 9c595dde0f
commit a1889cd702
2 changed files with 54 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/Border.js
View File

@ -15,4 +15,51 @@ html2canvas.prototype.getBorderData = function(el){
return borders; return borders;
} }
html2canvas.prototype.drawBorders = function(el,ctx, x, y, w, h){
/*
* TODO add support for different border-style's than solid
*/
var borders = this.getBorderData(el);
var _ = this;
this.each(borders,function(borderSide,borderData){
if (borderData.width>0){
var bx = x,
by = y,
bw = w,
bh = h-(borders[2].width);
switch(borderSide){
case 0:
// top border
bh = borders[0].width;
break;
case 1:
// right border
bx = x+w-(borders[1].width);
bw = borders[1].width;
break;
case 2:
// bottom border
by = (by+h)-(borders[2].width);
bh = borders[2].width;
break;
case 3:
// left border
bw = borders[3].width;
break;
}
_.newRect(ctx,bx,by,bw,bh,borderData.color);
}
});
return borders;
};

47
src/Draw.js
View File

@ -14,7 +14,10 @@ html2canvas.prototype.newElement = function(el,parentStack){
image; image;
var bgcolor = this.getCSS(el,"background-color"); var bgcolor = this.getCSS(el,"background-color");
var zindex = this.formatZ(this.getCSS(el,"z-index"),this.getCSS(el,"position"),parentStack.zIndex,el.parentNode);
parentStack = parentStack || {};
var zindex = this.formatZ(this.getCSS(el,"zIndex"),this.getCSS(el,"position"),parentStack.zIndex,el.parentNode);
//console.log(el.nodeName+":"+zindex+":"+this.getCSS(el,"position")+":"+this.numDraws+":"+this.getCSS(el,"z-index")) //console.log(el.nodeName+":"+zindex+":"+this.getCSS(el,"position")+":"+this.numDraws+":"+this.getCSS(el,"z-index"))
@ -33,46 +36,8 @@ html2canvas.prototype.newElement = function(el,parentStack){
this.setContextVariable(ctx,"globalAlpha",stack.opacity); this.setContextVariable(ctx,"globalAlpha",stack.opacity);
/* // draw element borders
* TODO add support for different border-style's than solid var borders = this.drawBorders(el, ctx, bounds.left, bounds.top, bounds.width, bounds.height);
*/
var borders = this.getBorderData(el);
this.each(borders,function(borderSide,borderData){
if (borderData.width>0){
var bx = x,
by = y,
bw = w,
bh = h-(borders[2].width);
switch(borderSide){
case 0:
// top border
bh = borders[0].width;
break;
case 1:
// right border
bx = x+w-(borders[1].width);
bw = borders[1].width;
break;
case 2:
// bottom border
by = (by+h)-(borders[2].width);
bh = borders[2].width;
break;
case 3:
// left border
bw = borders[3].width;
break;
}
_.newRect(ctx,bx,by,bw,bh,borderData.color);
}
});
if (this.ignoreRe.test(el.nodeName) && this.opts.iframeDefault != "transparent"){ if (this.ignoreRe.test(el.nodeName) && this.opts.iframeDefault != "transparent"){