Commit Graph

8 Commits

Author SHA1 Message Date
Jare Guo 3f1b682d19 Merge commit '0d438a748a5aae594e29344fffe4ea040e235c81'
# Conflicts:
#	cocos2d/core/components/CCRendererInSG.js
#	cocos2d/core/load-pipeline/asset-table.js
#	cocos2d/tilemap/CCTiledMap.js
#	jsb/jsb-editbox.js
2016-04-27 10:01:06 +08:00
zilongshanren e5fe29878b fix editbox begin and end callback not called. 2016-04-25 17:57:55 +08:00
Jare Guo 4b45975ed8 minor update 2016-04-25 14:34:07 +08:00
zilongshanren 897806994f fix jsb editbox missing API issue (#583) 2016-04-11 17:44:26 +08:00
zilongshanren 83c30ea536 fix editbox maxLength 2016-03-24 18:01:41 +08:00
Nan Wang 3a70ae6060 update license file and source code header. 2016-03-01 11:04:12 +08:00
zilongshanren 5bf14a8f4c Improve EditBox
change SpriteFrame to Sprite

rename placeHolder to placeholder

fix placeholder

Revert "change SpriteFrame to Sprite"

This reverts commit d968d8ac9a01d91b3055830aab109b934ae27138.

fix clear spriteframe

fix init size and label font size

add line height support
2016-02-26 16:28:18 +08:00
zilongshanren d6a977fd38 fix jsb editbox issue 2016-02-24 21:26:05 +08:00