Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop

pandamicro · pandamicro · commit 3f1a0f30cbaf · 2014-06-04T15:41:08.000+08:00
diff --git a/extensions/ccui/uiwidgets/UIText.js b/extensions/ccui/uiwidgets/UIText.js
@@ -386,7 +386,7 @@ ccui.Text = ccui.Widget.extend(/** @lends ccui.Text# */{
         this.setFontSize(uiLabel._labelRenderer.getFontSize());
         this.setString(uiLabel.getString());
         this.setTouchScaleChangeEnabled(uiLabel.touchScaleEnabled);
-        this.setTextAreaSize(uiLabel._size);
+        this.setTextAreaSize(uiLabel._textAreaSize);
         this.setTextHorizontalAlignment(uiLabel._textHorizontalAlignment);
         this.setTextVerticalAlignment(uiLabel._textVerticalAlignment);
     }

Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,7 @@ ccui.Text = ccui.Widget.extend(/** @lends ccui.Text# */{`
`386`	`386`	`this.setFontSize(uiLabel._labelRenderer.getFontSize());`
`387`	`387`	`this.setString(uiLabel.getString());`
`388`	`388`	`this.setTouchScaleChangeEnabled(uiLabel.touchScaleEnabled);`
`389`		`- this.setTextAreaSize(uiLabel._size);`
	`389`	`+ this.setTextAreaSize(uiLabel._textAreaSize);`
`390`	`390`	`this.setTextHorizontalAlignment(uiLabel._textHorizontalAlignment);`
`391`	`391`	`this.setTextVerticalAlignment(uiLabel._textVerticalAlignment);`
`392`	`392`	`}`