diff --git a/HEADER.js b/HEADER.js index cca00f98..6d3e61a0 100644 --- a/HEADER.js +++ b/HEADER.js @@ -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; diff --git a/dist/all.js b/dist/all.js index 3b59b7b3..c82a7eeb 100644 --- a/dist/all.js +++ b/dist/all.js @@ -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; }, diff --git a/package.json b/package.json index 5fe50eab..405bd2f4 100644 --- a/package.json +++ b/package.json @@ -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 ", "keywords": ["canvas", "graphic", "graphics", "SVG", "node-canvas", "parser", "HTML5", "object model"], "repository": "git://github.com/kangax/fabric.js", diff --git a/site b/site index 1edb9956..fb3ecc3c 160000 --- a/site +++ b/site @@ -1 +1 @@ -Subproject commit 1edb9956fa7b19503000afaa642b4d5d6684a555 +Subproject commit fb3ecc3c570c2927d3e8c32ed463521af9c123d5 diff --git a/src/text.class.js b/src/text.class.js index cbfe15d3..a6d965ce 100644 --- a/src/text.class.js +++ b/src/text.class.js @@ -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; },