Merge pull request #14100 from CocosRobot/update_lua_bindings_1444440864

[ci skip][AUTO]: updating luabinding & jsbinding automatically
This commit is contained in:
pandamicro 2015-10-10 09:44:51 +08:00
commit bf35655ce3
6 changed files with 13 additions and 13 deletions

View File

@ -7,7 +7,7 @@
--------------------------------
-- Stop an Action with a name.<br>
-- param jsonName UI file name<br>
-- param actionName action name in teh UIfile.<br>
-- param actionName action name in the UIfile.<br>
-- return ActionObject which named as the param name
-- @function [parent=#ActionManagerEx] stopActionByName
-- @param self

View File

@ -197,7 +197,7 @@
--------------------------------
-- Adjust the background image. YES by default. If the property is set to NO, the<br>
-- background will use the prefered size of the background image.
-- background will use the preferred size of the background image.
-- @function [parent=#ControlButton] doesAdjustBackgroundImage
-- @param self
-- @return bool#bool ret (return value: bool)

View File

@ -41,7 +41,7 @@
-- @return float#float ret (return value: float)
--------------------------------
-- Factorize the event dispath into these methods.
-- Factorize the event dispatch into these methods.
-- @function [parent=#ControlPotentiometer] potentiometerBegan
-- @param self
-- @param #vec2_table location

View File

@ -281,7 +281,7 @@
--------------------------------
-- Removes all children from the container, and do a cleanup to all running actions depending on the cleanup parameter.<br>
-- param cleanup true if all running actions on all children nodes should be cleanup, false oterwise.<br>
-- param cleanup true if all running actions on all children nodes should be cleanup, false otherwise.<br>
-- js removeAllChildren<br>
-- lua removeAllChildren
-- @function [parent=#Layout] removeAllChildrenWithCleanup

View File

@ -143,7 +143,7 @@
-- @return bool#bool ret (return value: bool)
--------------------------------
-- brief Change the prefered size of Scale9Sprite.<br>
-- brief Change the preferred size of Scale9Sprite.<br>
-- param size A delimitation zone.
-- @function [parent=#Scale9Sprite] setPreferredSize
-- @param self
@ -177,7 +177,7 @@
-- @return float#float ret (return value: float)
--------------------------------
-- brief Query the Scale9Sprite's prefered size.<br>
-- brief Query the Scale9Sprite's preferred size.<br>
-- return Scale9Sprite's cap inset.
-- @function [parent=#Scale9Sprite] getCapInsets
-- @param self
@ -252,8 +252,8 @@
-- @return bool#bool ret (return value: bool)
--------------------------------
-- brief Query the Scale9Sprite's prefered size.<br>
-- return Scale9Sprite's prefered size.
-- brief Query the Scale9Sprite's preferred size.<br>
-- return Scale9Sprite's preferred size.
-- @function [parent=#Scale9Sprite] getPreferredSize
-- @param self
-- @return size_table#size_table ret (return value: size_table)
@ -272,7 +272,7 @@
-- Also, flipping the texture doesn't alter the anchorPoint.<br>
-- If you want to flip the anchorPoint too, and/or to flip the children too use:<br>
-- widget->setScaleY(widget->getScaleY() * -1);<br>
-- return true if the widget is flipped vertically, flase otherwise.
-- return true if the widget is flipped vertically, false otherwise.
-- @function [parent=#Scale9Sprite] isFlippedY
-- @param self
-- @return bool#bool ret (return value: bool)

View File

@ -276,7 +276,7 @@
--------------------------------
-- Sets whether the widget should be flipped vertically or not.<br>
-- param flippedY true if the widget should be flipped vertically, flase otherwise.
-- param flippedY true if the widget should be flipped vertically, false otherwise.
-- @function [parent=#Widget] setFlippedY
-- @param self
-- @param #bool flippedY
@ -389,7 +389,7 @@
-- param pt The point in `Vec2`.<br>
-- param camera The camera look at widget, used to convert GL screen point to near/far plane.<br>
-- param p Point to a Vec3 for store the intersect point, if don't need them set to nullptr.<br>
-- return true if the point is in widget's content space, flase otherwise.
-- return true if the point is in widget's content space, false otherwise.
-- @function [parent=#Widget] hitTest
-- @param self
-- @param #vec2_table pt
@ -487,7 +487,7 @@
-- It not only flips the texture of the widget, but also the texture of the widget's children.<br>
-- Also, flipping relies on widget's anchor point.<br>
-- Internally, it just use setScaleY(-1) to flip the widget.<br>
-- return true if the widget is flipped vertically, flase otherwise.
-- return true if the widget is flipped vertically, false otherwise.
-- @function [parent=#Widget] isFlippedY
-- @param self
-- @return bool#bool ret (return value: bool)
@ -495,7 +495,7 @@
--------------------------------
-- Checks a point if in parent's area.<br>
-- param pt A point in `Vec2`.<br>
-- return true if the point is in parent's area, flase otherwise.
-- return true if the point is in parent's area, false otherwise.
-- @function [parent=#Widget] isClippingParentContainsPoint
-- @param self
-- @param #vec2_table pt