Skip to content

Commit

Permalink
Merge pull request cocos2d#14408 from CocosRobot/update_lua_bindings_…
Browse files Browse the repository at this point in the history
…1447733106

[ci skip][AUTO]: updating luabinding & jsbinding automatically
  • Loading branch information
zilongshanren committed Nov 18, 2015
2 parents 5d8cfa8 + 0794c7a commit 61614d6
Show file tree
Hide file tree
Showing 8 changed files with 711 additions and 598 deletions.
174 changes: 94 additions & 80 deletions cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_ui_auto_api.js
Original file line number Diff line number Diff line change
Expand Up @@ -692,16 +692,6 @@ isPropagateTouchEvents : function (
return false;
},

/**
* @method getCurrentFocusedWidget
* @return {ccui.Widget}
*/
getCurrentFocusedWidget : function (
)
{
return ccui.Widget;
},

/**
* @method hitTest
* @param {vec2_object} arg0
Expand Down Expand Up @@ -928,6 +918,16 @@ bool
{
},

/**
* @method getCurrentFocusedWidget
* @return {ccui.Widget}
*/
getCurrentFocusedWidget : function (
)
{
return ccui.Widget;
},

/**
* @method create
* @return {ccui.Widget}
Expand Down Expand Up @@ -3353,12 +3353,12 @@ getItemsMargin : function (

/**
* @method jumpToItem
* @param {int} arg0
* @param {long} arg0
* @param {vec2_object} arg1
* @param {vec2_object} arg2
*/
jumpToItem : function (
int,
long,
vec2,
vec2
)
Expand Down Expand Up @@ -3517,13 +3517,13 @@ long

/**
* @method scrollToItem
* @param {int|int} int
* @param {long|long} long
* @param {vec2_object|vec2_object} vec2
* @param {vec2_object|vec2_object} vec2
* @param {float} float
*/
scrollToItem : function(
int,
long,
vec2,
vec2,
float
Expand Down Expand Up @@ -4706,119 +4706,115 @@ TextBMFont : function (
ccui.PageView = {

/**
* @method getCustomScrollThreshold
* @return {float}
* @method setIndicatorSpaceBetweenIndexNodes
* @param {float} arg0
*/
getCustomScrollThreshold : function (
setIndicatorSpaceBetweenIndexNodes : function (
float
)
{
return 0;
},

/**
* @method getCurPageIndex
* @return {long}
* @method setIndicatorSelectedIndexColor
* @param {color3b_object} arg0
*/
getCurPageIndex : function (
setIndicatorSelectedIndexColor : function (
color3b
)
{
return 0;
},

/**
* @method setDirection
* @param {ccui.PageView::Direction} arg0
* @method getIndicatorSelectedIndexColor
* @return {color3b_object}
*/
setDirection : function (
direction
getIndicatorSelectedIndexColor : function (
)
{
return cc.Color3B;
},

/**
* @method addWidgetToPage
* @param {ccui.Widget} arg0
* @param {long} arg1
* @param {bool} arg2
* @method getIndicatorPositionAsAnchorPoint
* @return {vec2_object}
*/
addWidgetToPage : function (
widget,
long,
bool
getIndicatorPositionAsAnchorPoint : function (
)
{
return cc.Vec2;
},

/**
* @method isUsingCustomScrollThreshold
* @return {bool}
* @method setIndicatorPosition
* @param {vec2_object} arg0
*/
isUsingCustomScrollThreshold : function (
setIndicatorPosition : function (
vec2
)
{
return false;
},

/**
* @method setCurPageIndex
* @param {long} arg0
* @method getIndicatorPosition
* @return {vec2_object}
*/
setCurPageIndex : function (
long
getIndicatorPosition : function (
)
{
return cc.Vec2;
},

/**
* @method removePage
* @param {ccui.Layout} arg0
* @method insertPage
* @param {ccui.Widget} arg0
* @param {int} arg1
*/
removePage : function (
layout
insertPage : function (
widget,
int
)
{
},

/**
* @method setUsingCustomScrollThreshold
* @param {bool} arg0
* @method getCurrentPageIndex
* @return {long}
*/
setUsingCustomScrollThreshold : function (
bool
getCurrentPageIndex : function (
)
{
return 0;
},

/**
* @method setCustomScrollThreshold
* @param {float} arg0
* @method removePage
* @param {ccui.Widget} arg0
*/
setCustomScrollThreshold : function (
float
removePage : function (
widget
)
{
},

/**
* @method insertPage
* @param {ccui.Layout} arg0
* @param {int} arg1
* @method setCurrentPageIndex
* @param {long} arg0
*/
insertPage : function (
layout,
int
setCurrentPageIndex : function (
long
)
{
},

/**
* @method getDirection
* @return {ccui.PageView::Direction}
* @method getIndicatorEnabled
* @return {bool}
*/
getDirection : function (
getIndicatorEnabled : function (
)
{
return 0;
return false;
},

/**
Expand All @@ -4832,35 +4828,53 @@ long
},

/**
* @method getPage
* @param {long} arg0
* @return {ccui.Layout}
* @method setIndicatorPositionAsAnchorPoint
* @param {vec2_object} arg0
*/
getPage : function (
long
setIndicatorPositionAsAnchorPoint : function (
vec2
)
{
return ccui.Layout;
},

/**
* @method removePageAtIndex
* @method scrollToItem
* @param {long} arg0
*/
removePageAtIndex : function (
scrollToItem : function (
long
)
{
},

/**
* @method getPages
* @return {Array}
* @method setIndicatorEnabled
* @param {bool} arg0
*/
getPages : function (
setIndicatorEnabled : function (
bool
)
{
},

/**
* @method addPage
* @param {ccui.Widget} arg0
*/
addPage : function (
widget
)
{
return new Array();
},

/**
* @method getIndicatorSpaceBetweenIndexNodes
* @return {float}
*/
getIndicatorSpaceBetweenIndexNodes : function (
)
{
return 0;
},

/**
Expand All @@ -4872,11 +4886,11 @@ removeAllPages : function (
},

/**
* @method addPage
* @param {ccui.Layout} arg0
* @method removePageAtIndex
* @param {long} arg0
*/
addPage : function (
layout
removePageAtIndex : function (
long
)
{
},
Expand Down
Loading

0 comments on commit 61614d6

Please sign in to comment.