Skip to content

Commit

Permalink
Merge pull request #31 from dumganhar/iss4234-event-dispatcher
Browse files Browse the repository at this point in the history
closed #4234: New EventDispacher test works ok on JSB.
  • Loading branch information
James Chen committed Mar 5, 2014
2 parents 37c3701 + 69b2a1d commit ecd0ce6
Show file tree
Hide file tree
Showing 12 changed files with 689 additions and 343 deletions.
113 changes: 75 additions & 38 deletions frameworks/js-bindings/bindings/auto/api/jsb_cocos2dx_auto_api.js
Original file line number Diff line number Diff line change
Expand Up @@ -1105,12 +1105,10 @@ checkAvailable : function (
cc.EventDispatcher = {

/**
* @method pauseEventListenersForTarget
* @param {cc.Node} arg0
* @param {bool} arg1
* @method setEnabled
* @param {bool} arg0
*/
pauseEventListenersForTarget : function (
node,
setEnabled : function (
bool
)
{
Expand All @@ -1136,16 +1134,6 @@ node
{
},

/**
* @method setEnabled
* @param {bool} arg0
*/
setEnabled : function (
bool
)
{
},

/**
* @method addCustomEventListener
* @param {String} arg0
Expand Down Expand Up @@ -1173,23 +1161,13 @@ int
},

/**
* @method removeEventListenersForType
* @param {cc.EventListener::Type} arg0
*/
removeEventListenersForType : function (
type
)
{
},

/**
* @method dispatchCustomEvent
* @param {String} arg0
* @param {void*} arg1
*/
dispatchCustomEvent : function (
str,
void
* @method removeEventListenersForTarget
* @param {cc.Node|cc.EventListener::Type} node
* @param {bool} bool
*/
removeEventListenersForTarget : function(
node,
bool
)
{
},
Expand All @@ -1207,13 +1185,13 @@ bool
},

/**
* @method removeEventListenersForTarget
* @param {cc.Node} arg0
* @param {bool} arg1
* @method dispatchCustomEvent
* @param {String} arg0
* @param {void*} arg1
*/
removeEventListenersForTarget : function (
node,
bool
dispatchCustomEvent : function (
str,
void
)
{
},
Expand All @@ -1240,6 +1218,18 @@ event
{
},

/**
* @method pauseEventListenersForTarget
* @param {cc.Node} arg0
* @param {bool} arg1
*/
pauseEventListenersForTarget : function (
node,
bool
)
{
},

/**
* @method removeCustomEventListeners
* @param {String} arg0
Expand Down Expand Up @@ -12539,6 +12529,43 @@ str

};

/**
* @class Device
*/
cc.Device = {

/**
* @method setAccelerometerEnabled
* @param {bool} arg0
*/
setAccelerometerEnabled : function (
bool
)
{
},

/**
* @method setAccelerometerInterval
* @param {float} arg0
*/
setAccelerometerInterval : function (
float
)
{
},

/**
* @method getDPI
* @return {int}
*/
getDPI : function (
)
{
return 0;
},

};

/**
* @class FileUtils
*/
Expand Down Expand Up @@ -14590,6 +14617,16 @@ TileMapAtlas : function (
*/
cc.EventListenerTouchOneByOne = {

/**
* @method isSwallowTouches
* @return {bool}
*/
isSwallowTouches : function (
)
{
return false;
},

/**
* @method setSwallowTouches
* @param {bool} arg0
Expand Down
Loading

0 comments on commit ecd0ce6

Please sign in to comment.