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

Manually call toString for colors

Browse Source
This commit is contained in:
MoyuScript 2014-12-13 19:23:00 +02:00
parent 2fb56dcee4
commit e1936be4d4
5 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dist/html2canvas.js vendored
View File

@ -3149,7 +3149,7 @@ function CanvasRenderer(width, height) {
} }
this.ctx = this.canvas.getContext("2d"); this.ctx = this.canvas.getContext("2d");
if (this.options.background) { if (this.options.background) {
this.rectangle(0, 0, width, height, this.options.background); this.rectangle(0, 0, width, height, new Color(this.options.background));
} }
this.taintCtx = this.document.createElement("canvas").getContext("2d"); this.taintCtx = this.document.createElement("canvas").getContext("2d");
this.ctx.textBaseline = "bottom"; this.ctx.textBaseline = "bottom";
@ -3160,7 +3160,7 @@ function CanvasRenderer(width, height) {
CanvasRenderer.prototype = Object.create(Renderer.prototype); CanvasRenderer.prototype = Object.create(Renderer.prototype);
CanvasRenderer.prototype.setFillStyle = function(fillStyle) { CanvasRenderer.prototype.setFillStyle = function(fillStyle) {
this.ctx.fillStyle = fillStyle; this.ctx.fillStyle = (fillStyle instanceof Color) ? fillStyle.toString() : fillStyle;
return this.ctx; return this.ctx;
}; };
@ -3178,7 +3178,7 @@ CanvasRenderer.prototype.circle = function(left, top, size, color) {
CanvasRenderer.prototype.circleStroke = function(left, top, size, color, stroke, strokeColor) { CanvasRenderer.prototype.circleStroke = function(left, top, size, color, stroke, strokeColor) {
this.circle(left, top, size, color); this.circle(left, top, size, color);
this.ctx.strokeStyle = strokeColor; this.ctx.strokeStyle = strokeColor.toString();
this.ctx.stroke(); this.ctx.stroke();
}; };
@ -3235,7 +3235,7 @@ CanvasRenderer.prototype.font = function(color, style, variant, weight, size, fa
}; };
CanvasRenderer.prototype.fontShadow = function(color, offsetX, offsetY, blur) { CanvasRenderer.prototype.fontShadow = function(color, offsetX, offsetY, blur) {
this.setVariable("shadowColor", color) this.setVariable("shadowColor", color.toString())
.setVariable("shadowOffsetY", offsetX) .setVariable("shadowOffsetY", offsetX)
.setVariable("shadowOffsetX", offsetY) .setVariable("shadowOffsetX", offsetY)
.setVariable("shadowBlur", blur); .setVariable("shadowBlur", blur);
@ -3295,7 +3295,7 @@ CanvasRenderer.prototype.renderBackgroundGradient = function(gradientImage, boun
bounds.left + bounds.width * gradientImage.x1, bounds.left + bounds.width * gradientImage.x1,
bounds.top + bounds.height * gradientImage.y1); bounds.top + bounds.height * gradientImage.y1);
gradientImage.colorStops.forEach(function(colorStop) { gradientImage.colorStops.forEach(function(colorStop) {
gradient.addColorStop(colorStop.stop, colorStop.color); gradient.addColorStop(colorStop.stop, colorStop.color.toString());
}); });
this.rectangle(bounds.left, bounds.top, bounds.width, bounds.height, gradient); this.rectangle(bounds.left, bounds.top, bounds.width, bounds.height, gradient);
} }

4
dist/html2canvas.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
src/renderers/canvas.js
View File

@ -7,7 +7,7 @@ function CanvasRenderer(width, height) {
} }
this.ctx = this.canvas.getContext("2d"); this.ctx = this.canvas.getContext("2d");
if (this.options.background) { if (this.options.background) {
this.rectangle(0, 0, width, height, this.options.background); this.rectangle(0, 0, width, height, new Color(this.options.background));
} }
this.taintCtx = this.document.createElement("canvas").getContext("2d"); this.taintCtx = this.document.createElement("canvas").getContext("2d");
this.ctx.textBaseline = "bottom"; this.ctx.textBaseline = "bottom";
@ -18,7 +18,7 @@ function CanvasRenderer(width, height) {
CanvasRenderer.prototype = Object.create(Renderer.prototype); CanvasRenderer.prototype = Object.create(Renderer.prototype);
CanvasRenderer.prototype.setFillStyle = function(fillStyle) { CanvasRenderer.prototype.setFillStyle = function(fillStyle) {
this.ctx.fillStyle = fillStyle; this.ctx.fillStyle = (fillStyle instanceof Color) ? fillStyle.toString() : fillStyle;
return this.ctx; return this.ctx;
}; };
@ -36,7 +36,7 @@ CanvasRenderer.prototype.circle = function(left, top, size, color) {
CanvasRenderer.prototype.circleStroke = function(left, top, size, color, stroke, strokeColor) { CanvasRenderer.prototype.circleStroke = function(left, top, size, color, stroke, strokeColor) {
this.circle(left, top, size, color); this.circle(left, top, size, color);
this.ctx.strokeStyle = strokeColor; this.ctx.strokeStyle = strokeColor.toString();
this.ctx.stroke(); this.ctx.stroke();
}; };
@ -93,7 +93,7 @@ CanvasRenderer.prototype.font = function(color, style, variant, weight, size, fa
}; };
CanvasRenderer.prototype.fontShadow = function(color, offsetX, offsetY, blur) { CanvasRenderer.prototype.fontShadow = function(color, offsetX, offsetY, blur) {
this.setVariable("shadowColor", color) this.setVariable("shadowColor", color.toString())
.setVariable("shadowOffsetY", offsetX) .setVariable("shadowOffsetY", offsetX)
.setVariable("shadowOffsetX", offsetY) .setVariable("shadowOffsetX", offsetY)
.setVariable("shadowBlur", blur); .setVariable("shadowBlur", blur);
@ -153,7 +153,7 @@ CanvasRenderer.prototype.renderBackgroundGradient = function(gradientImage, boun
bounds.left + bounds.width * gradientImage.x1, bounds.left + bounds.width * gradientImage.x1,
bounds.top + bounds.height * gradientImage.y1); bounds.top + bounds.height * gradientImage.y1);
gradientImage.colorStops.forEach(function(colorStop) { gradientImage.colorStops.forEach(function(colorStop) {
gradient.addColorStop(colorStop.stop, colorStop.color); gradient.addColorStop(colorStop.stop, colorStop.color.toString());
}); });
this.rectangle(bounds.left, bounds.top, bounds.width, bounds.height, gradient); this.rectangle(bounds.left, bounds.top, bounds.width, bounds.height, gradient);
} }

6
tests/mocha/css.js
View File

@ -72,12 +72,12 @@ describe('Text-shadow', function() {
expect(shadows[0].offsetX).to.equal(i); expect(shadows[0].offsetX).to.equal(i);
expect(shadows[0].offsetY).to.equal(i); expect(shadows[0].offsetY).to.equal(i);
if (i < 2) { if (i < 2) {
expect(shadows[0].color).to.match(/rgba?\(0, 0, 0(, 0)?\)/); expect(shadows[0].color.toString()).to.equal('rgba(0,0,0,0)');
} else if (i % 2 === 0) { } else if (i % 2 === 0) {
expect(shadows[0].color).to.equal('rgb(2, 2, 2)'); expect(shadows[0].color.toString()).to.equal('rgb(2,2,2)');
} else { } else {
var opacity = '0.2'; var opacity = '0.2';
expect(shadows[0].color).to.match(/rgba\(2, 2, 2, (0.2|0\.199219)\)/); expect(shadows[0].color.toString()).to.match(/rgba\(2,2,2,(0.2|0\.199219)\)/);
} }
// only testing blur once // only testing blur once

1
tests/mocha/index.html
View File

@ -4,6 +4,7 @@
<title>Mocha Tests</title> <title>Mocha Tests</title>
<link rel="stylesheet" href="lib/mocha.css" /> <link rel="stylesheet" href="lib/mocha.css" />
<script type="text/javascript" src="../../src/log.js"></script> <script type="text/javascript" src="../../src/log.js"></script>
<script type="text/javascript" src="../../src/color.js"></script>
<script type="text/javascript" src="../../src/nodecontainer.js"></script> <script type="text/javascript" src="../../src/nodecontainer.js"></script>
<script type="text/javascript" src="../../src/stackingcontext.js"></script> <script type="text/javascript" src="../../src/stackingcontext.js"></script>
<script type="text/javascript" src="../../src/textcontainer.js"></script> <script type="text/javascript" src="../../src/textcontainer.js"></script>