lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-06-28 06:24:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

updated docs

Browse Source
This commit is contained in:
Eric Rowell 2012-03-30 21:06:26 -07:00
parent ca887f1ff5
commit 540670ba8b
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/kinetic-core.js vendored
View File

@ -3,7 +3,7 @@
* http://www.kineticjs.com/ * http://www.kineticjs.com/
* Copyright 2012, Eric Rowell * Copyright 2012, Eric Rowell
* Licensed under the MIT or GPL Version 2 licenses. * Licensed under the MIT or GPL Version 2 licenses.
* Date: Mar 25 2012 * Date: Mar 30 2012
* *
* Copyright (C) 2011 - 2012 by Eric Rowell * Copyright (C) 2011 - 2012 by Eric Rowell
* *

4
dist/kinetic-core.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
src/shapes/Text.js
View File

@ -124,9 +124,7 @@ Kinetic.Text.prototype = {
return this.fontSize; return this.fontSize;
}, },
/** /**
* set font style using same rules as the first argument for the css spec's shorthand font property: * set font style. Can be "normal", "italic", or "bold". "normal" is the default.
* http://www.w3.org/TR/CSS21/fonts.html#propdef-font
* i.e. [ <'font-style'> || <'font-variant'> || <'font-weight'> ]
* @param {String} fontStyle * @param {String} fontStyle
*/ */
setFontStyle: function(fontStyle) { setFontStyle: function(fontStyle) {

3
tests/js/unitTests.js
View File

@ -832,6 +832,7 @@ Test.prototype.tests = {
textFill: '#888', textFill: '#888',
textStroke: '#333', textStroke: '#333',
padding: 10, padding: 10,
fontStyle: 'normal',
//draggable: true, //draggable: true,
align: 'center', align: 'center',
verticalAlign: 'middle' verticalAlign: 'middle'
@ -866,7 +867,7 @@ Test.prototype.tests = {
text.setTextFill('blue'); text.setTextFill('blue');
text.setTextStroke('red'); text.setTextStroke('red');
text.setTextStrokeWidth(10); text.setTextStrokeWidth(10);
test(text.getFontFamily() === 'Arial', 'font family should be Arial'); test(text.getFontFamily() === 'Arial', 'font family should be Arial');
test(text.getFontSize() === 30, 'text size should be 30'); test(text.getFontSize() === 30, 'text size should be 30');
test(text.getFontStyle() == 'italic', 'font style should be italic'); test(text.getFontStyle() == 'italic', 'font style should be italic');