lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-09-19 02:37:59 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

changed wrapping attribute to wrap

Browse Source
This commit is contained in:
Eric Rowell
2013-03-20 09:26:55 -07:00
parent 809da97a45
commit 5b3a87b98d
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/shapes/Text.js
View File

@@ -21,7 +21,7 @@
WORD = 'word',
CHAR = 'char',
NONE = 'none',
ATTR_CHANGE_LIST = ['fontFamily', 'fontSize', 'fontStyle', 'padding', 'align', 'lineHeight', 'text', 'width', 'height', 'wrapping'],
ATTR_CHANGE_LIST = ['fontFamily', 'fontSize', 'fontStyle', 'padding', 'align', 'lineHeight', 'text', 'width', 'height', 'wrap'],
// cached variables
attrChangeListLen = ATTR_CHANGE_LIST.length,
@@ -41,7 +41,7 @@
* @param {Number} [config.width] default is auto
* @param {Number} [config.height] default is auto
* @param {Number} [config.lineHeight] default is 1
* @param {String} [config.wrapping] can be word, char, or none. Default is word
* @param {String} [config.wrap] can be word, char, or none. Default is word
* {{ShapeParams}}
* {{NodeParams}}
*/
@@ -229,9 +229,9 @@
fixedHeight = height !== AUTO,
maxHeightPx = height - this.getPadding() * 2,
currentHeightPx = 0,
wrapping = this.getWrapping(),
shouldWrap = wrapping !== NONE,
wrapAtWord = wrapping !== CHAR && shouldWrap;
wrap = this.getWrap(),
shouldWrap = wrap !== NONE,
wrapAtWord = wrap !== CHAR && shouldWrap;
this.textArr = [];
dummyContext.save();
@@ -322,7 +322,7 @@
Kinetic.Node.addGetterSetter(Kinetic.Text, 'padding', 0);
Kinetic.Node.addGetterSetter(Kinetic.Text, 'align', LEFT);
Kinetic.Node.addGetterSetter(Kinetic.Text, 'lineHeight', 1);
Kinetic.Node.addGetterSetter(Kinetic.Text, 'wrapping', NONE);
Kinetic.Node.addGetterSetter(Kinetic.Text, 'wrap', NONE);
Kinetic.Node.addGetter(Kinetic.Text, TEXT, EMPTY_STRING);

8
tests/js/unit/shapes/textTests.js
View File

@@ -186,7 +186,7 @@ Test.Modules.Text = {
padding: 0,
align: 'center',
draggable: true,
wrapping: 'WORD'
wrap: 'WORD'
});
// center text box
@@ -395,7 +395,7 @@ Test.Modules.Text = {
fontSize: 15,
fontFamily: 'Calibri',
fill: '#000',
wrapping: 'word'
wrap: 'word'
});
layer.add(text);
@@ -403,11 +403,11 @@ Test.Modules.Text = {
warn(layer.toDataURL() === dataUrls['wrapped text']['wrapping to words'], 'text should be wrapped to words');
text.setWrapping('none');
text.setWrap('none');
layer.draw();
warn(layer.toDataURL() === dataUrls['wrapped text']['no wrapping'], 'text should not be wrapped');
text.setWrapping('char');
text.setWrap('char');
layer.draw();
warn(layer.toDataURL() === dataUrls['wrapped text']['wrapping to chars'], 'text should be wrapped to chars');