Hopiu/fabric.js
1
0
Fork 0
mirror of https://github.com/Hopiu/fabric.js.git synced 2026-03-16 22:10:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix bug w. fabric.Text not accounting for fontSize.

Browse source
This commit is contained in:
kangax 2011-09-21 11:18:58 -04:00
parent 99e64c30ee
commit 36fe5e3a6f
5 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
HEADER.js
View file

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

11
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.5.13" };
var fabric = fabric || { version: "0.5.14" };
if (typeof exports != 'undefined') {
exports.fabric = fabric;
@ -10801,7 +10801,7 @@ fabric.util.object.extend(fabric.Canvas.prototype, {
* @property
* @type Number
*/
fontSize: 20,
fontSize: 40,
/**
* @property
@ -10992,13 +10992,8 @@ fabric.util.object.extend(fabric.Canvas.prototype, {
container.appendChild(el);
el.innerHTML = this.text;
// need to specify these manually, since Jaxer doesn't support retrieving computed style
el.style.fontSize = '40px';
el.style.fontWeight = '400';
el.style.fontSize = this.fontSize + 'px';
el.style.letterSpacing = 'normal';
el.style.color = '#000000';
el.style.fontWeight = '600';
el.style.fontFamily = 'Verdana';
return el;
},

2
package.json
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.5.13",
"version": "0.5.14",
"author": "Juriy Zaytsev <kangax@gmail.com>",
"keywords": ["canvas", "graphic", "graphics", "SVG", "node-canvas", "parser", "HTML5", "object model"],
"repository": "git://github.com/kangax/fabric.js",

2
site

@ -1 +1 @@
Subproject commit 1edb9956fa7b19503000afaa642b4d5d6684a555
Subproject commit fb3ecc3c570c2927d3e8c32ed463521af9c123d5

9
src/text.class.js
View file

@ -27,7 +27,7 @@
* @property
* @type Number
*/
fontSize: 20,
fontSize: 40,
/**
* @property
@ -218,13 +218,8 @@
container.appendChild(el);
el.innerHTML = this.text;
// need to specify these manually, since Jaxer doesn't support retrieving computed style
el.style.fontSize = '40px';
el.style.fontWeight = '400';
el.style.fontSize = this.fontSize + 'px';
el.style.letterSpacing = 'normal';
el.style.color = '#000000';
el.style.fontWeight = '600';
el.style.fontFamily = 'Verdana';
return el;
},