Commit Graph

35 Commits

Author SHA1 Message Date
Jare Guo 142aeed175 add preload lifecycle method 2016-05-16 15:41:49 +08:00
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 2f66e219a0 Merge pull request #625 from jareguo/master
optimizations
2016-04-25 15:03:25 +08:00
Jare Guo 1b8fafc9cc turn on dead code optimization in building 2016-04-25 14:32:57 +08:00
zilongshanren 74dde2f23a improve button and editbox event args
add sender args to editbox callback

improve ComponentEventHandler

remove this

add use strict statement
2016-04-22 14:47:33 +08:00
Nan Wang c3961feb8a update i18n differed component help link 2016-04-11 19:06:30 +08:00
zilongshanren 6522aad698 fix editbox touch issue.
fix loadRes API issue
2016-03-26 10:40:15 +08:00
zilongshanren 83c30ea536 fix editbox maxLength 2016-03-24 18:01:41 +08:00
zilongshanren b01f458217 fix label, editbox first time content size change 2016-03-24 17:07:38 +08:00
Jare Guo db5170e367 Merge pull request #493 from knoxHuang/v1.0
update CCEditBox API
2016-03-18 09:58:56 +08:00
knoxHuang 906863c134 update CCEditBox API 2016-03-17 17:28:50 +08:00
knoxHuang 25703699bf update CCEditBox API 2016-03-17 16:58:01 +08:00
zilongshanren 963dad9152 we should update editbox size first. 2016-03-16 17:04:11 +08:00
knoxHuang 44ec950e71 update components api url 2016-03-09 18:42:36 +08:00
knoxHuang 2d7f991a11 update components api url 2016-03-09 18:33:13 +08:00
knoxHuang 57a8e12052 built-in module in the title next to add a help icon. 2016-03-09 17:57:13 +08:00
zilongshanren 3ed9e76cb7 fix editbox capInsets error when bg is empty 2016-03-03 16:00:14 +08:00
zilongshanren 23e977e453 add editbox background scale9 capInsets support 2016-03-02 14:07:23 +08:00
zilongshanren a7f7ed03dd fix jsb editbox crash 2016-03-02 11:25:48 +08:00
Nan Wang 3a70ae6060 update license file and source code header. 2016-03-01 11:04:12 +08:00
Jare Guo 94da7696c5 update PR 2016-02-27 17:09:06 +08:00
Jare Guo 0d4022436c rename ComponentInSG -> RendererBelowSG 2016-02-26 19:28:22 +08:00
zilongshanren f9c747d0a9 cleanup code 2016-02-26 18:13:29 +08:00
zilongshanren 532916cd43 add i18n 2016-02-26 16:28:21 +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
zhangbin f8a543520a Move emitEvents from cc.Component to cc.Component.EventHandler. 2016-02-25 14:25:02 +08:00
zhangbin e10ae216e8 Emit mapLoaded when the map loading is finished. 2016-02-25 14:25:02 +08:00
zilongshanren d6a977fd38 fix jsb editbox issue 2016-02-24 21:26:05 +08:00
knoxHuang 373aa9f5f6 fix EditorBox string value is not updated bug 2016-02-19 11:33:03 +08:00
minggo abf53d15a6 fix some comments 2016-02-02 15:46:20 +08:00
Jare Guo da5905a98d make it likely to initialize comp._sgNode just in constructor 2016-01-27 16:42:45 +08:00
zilongshanren a67c846bf7 refine EditBox 2016-01-26 15:00:06 +08:00
zilongshanren f98aa9bc31 fix ci errors and refactor cceditbox 2016-01-25 10:29:54 +08:00
zilongshanren 7c66c1e4b6 add EditBox component.
rename editbox to sgEditBox

add editbox components

add background scale9sprite to editbox

add function to change editbox bgsprite size

add editbox properties

add string property

sync all the interfaces

refactor button event handler

finish single line editobox

finish multiline editbox

add editbox component
2016-01-22 18:08:04 +08:00