Fix fabric.Text#textShadow to actually use specified color.

This commit is contained in:
kangax 2012-01-05 22:39:30 -05:00
parent e20a37ba6a
commit c39053456c
6 changed files with 11 additions and 13 deletions

View file

@ -1,6 +1,6 @@
/*! Fabric.js Copyright 2008-2011, Bitsonnet (Juriy Zaytsev, Maxim Chernyak) */
var fabric = fabric || { version: "0.7.7" };
var fabric = fabric || { version: "0.7.8" };
if (typeof exports != 'undefined') {
exports.fabric = fabric;

9
dist/all.js vendored
View file

@ -1,6 +1,6 @@
/*! Fabric.js Copyright 2008-2011, Bitsonnet (Juriy Zaytsev, Maxim Chernyak) */
var fabric = fabric || { version: "0.7.7" };
var fabric = fabric || { version: "0.7.8" };
if (typeof exports != 'undefined') {
exports.fabric = fabric;
@ -1360,8 +1360,8 @@ Cufon.registerEngine('canvas', (function() {
Cufon.textOptions.boundaries = boundaries;
}
function renderText() {
g.fillStyle = Cufon.textOptions.color || style.get('color');
function renderText(color) {
g.fillStyle = color || Cufon.textOptions.color || style.get('color');
var left = 0, lineNum = 0;
@ -1461,9 +1461,8 @@ Cufon.registerEngine('canvas', (function() {
for (var i = 0, l = shadows.length; i < l; ++i) {
var shadow = shadows[i];
g.save();
g.fillStyle = shadow.color;
g.translate.apply(g, shadowOffsets[i]);
renderText();
renderText(shadow.color);
g.restore();
}
}

4
dist/all.min.js vendored

File diff suppressed because one or more lines are too long

BIN
dist/all.min.js.gz vendored

Binary file not shown.

View file

@ -854,8 +854,8 @@ Cufon.registerEngine('canvas', (function() {
Cufon.textOptions.boundaries = boundaries;
}
function renderText() {
g.fillStyle = Cufon.textOptions.color || style.get('color');
function renderText(color) {
g.fillStyle = color || Cufon.textOptions.color || style.get('color');
var left = 0, lineNum = 0;
@ -955,9 +955,8 @@ Cufon.registerEngine('canvas', (function() {
for (var i = 0, l = shadows.length; i < l; ++i) {
var shadow = shadows[i];
g.save();
g.fillStyle = shadow.color;
g.translate.apply(g, shadowOffsets[i]);
renderText();
renderText(shadow.color);
g.restore();
}
}

View file

@ -1,7 +1,7 @@
{
"name": "fabric",
"description": "Object model for HTML5 canvas, and SVG-to-canvas parser. Backed by jsdom and node-canvas.",
"version": "0.7.7",
"version": "0.7.8",
"author": "Juriy Zaytsev <kangax@gmail.com>",
"keywords": ["canvas", "graphic", "graphics", "SVG", "node-canvas", "parser", "HTML5", "object model"],
"repository": "git://github.com/kangax/fabric.js",