Merge pull request #1477 from cocos2d/wp8_jsb

merge wp8_jsb to develop

Author: pandamicro

build/cocos2d-jsb-samples.wp8.sln

@@ -14710,29 +14710,29 @@ init : function (
 },
 
 /**
- * @method alignItemsHorizontallyWithPadding
- * @param {float} arg0
+ * @method alignItemsHorizontally
  */
-alignItemsHorizontallyWithPadding : function (
-float 
+alignItemsHorizontally : function (
 )
 {
 },
 
 /**
- * @method alignItemsVerticallyWithPadding
+ * @method alignItemsHorizontallyWithPadding
  * @param {float} arg0
  */
-alignItemsVerticallyWithPadding : function (
+alignItemsHorizontallyWithPadding : function (
 float 
 )
 {
 },
 
 /**
- * @method alignItemsHorizontally
+ * @method alignItemsVerticallyWithPadding
+ * @param {float} arg0
  */
-alignItemsHorizontally : function (
+alignItemsVerticallyWithPadding : function (
+float 
 )
 {
 },

frameworks/js-bindings/bindings/auto/api/jsb_cocos2dx_auto_api.js

@@ -1156,16 +1156,6 @@ getValue : function (
     return 0;
 },
 
-/**
- * @method getPreviousLocation
- * @return {vec2_object}
- */
-getPreviousLocation : function (
-)
-{
-    return cc.Vec2;
-},
-
 /**
  * @method distanceBetweenPointAndPoint
  * @param {vec2_object} arg0
@@ -1190,6 +1180,16 @@ vec2
 {
 },
 
+/**
+ * @method getPreviousLocation
+ * @return {vec2_object}
+ */
+getPreviousLocation : function (
+)
+{
+    return cc.Vec2;
+},
+
 /**
  * @method setProgressTimer
  * @param {cc.ProgressTimer} arg0
@@ -2346,16 +2346,6 @@ verticalfillorder
 {
 },
 
-/**
- * @method scrollViewDidZoom
- * @param {cc.ScrollView} arg0
- */
-scrollViewDidZoom : function (
-scrollview 
-)
-{
-},
-
 /**
  * @method _updateContentSize
  */
@@ -2416,6 +2406,16 @@ reloadData : function (
 {
 },
 
+/**
+ * @method scrollViewDidZoom
+ * @param {cc.ScrollView} arg0
+ */
+scrollViewDidZoom : function (
+scrollview 
+)
+{
+},
+
 /**
  * @method insertCellAtIndex
  * @param {long} arg0

frameworks/js-bindings/bindings/auto/api/jsb_cocos2dx_extension_auto_api.js

@@ -1870,16 +1870,6 @@ ArmatureAnimation : function (
  */
 ccs.ArmatureDataManager = {
 
-/**
- * @method getAnimationDatas
- * @return {map_object}
- */
-getAnimationDatas : function (
-)
-{
-    return map_object;
-},
-
 /**
  * @method removeAnimationData
  * @param {String} arg0
@@ -2032,6 +2022,16 @@ str
 {
 },
 
+/**
+ * @method getAnimationDatas
+ * @return {map_object}
+ */
+getAnimationDatas : function (
+)
+{
+    return map_object;
+},
+
 /**
  * @method isAutoLoadSpriteFile
  * @return {bool}

frameworks/js-bindings/bindings/auto/api/jsb_cocos2dx_studio_auto_api.js

@@ -3328,13 +3328,13 @@ getAttachWithIME : function (
  * @method onTextFieldDeleteBackward
  * @param {cc.TextFieldTTF} arg0
  * @param {char} arg1
- * @param {unsigned long} arg2
+ * @param {unsigned int} arg2
  * @return {bool}
  */
 onTextFieldDeleteBackward : function (
 textfieldttf, 
 char, 
-long 
+int 
 )
 {
     return false;
@@ -3429,11 +3429,11 @@ isPasswordEnabled : function (
 /**
  * @method insertText
  * @param {char} arg0
- * @param {unsigned long} arg1
+ * @param {unsigned int} arg1
  */
 insertText : function (
 char, 
-long 
+int 
 )
 {
 },
@@ -3452,13 +3452,13 @@ str
  * @method onTextFieldInsertText
  * @param {cc.TextFieldTTF} arg0
  * @param {char} arg1
- * @param {unsigned long} arg2
+ * @param {unsigned int} arg2
  * @return {bool}
  */
 onTextFieldInsertText : function (
 textfieldttf, 
 char, 
-long 
+int 
 )
 {
     return false;
@@ -4251,14 +4251,14 @@ ccui.Helper = {
 /**
  * @method getSubStringOfUTF8String
  * @param {String} arg0
- * @param {unsigned long} arg1
- * @param {unsigned long} arg2
+ * @param {unsigned int} arg1
+ * @param {unsigned int} arg2
  * @return {String}
  */
 getSubStringOfUTF8String : function (
 str, 
-long, 
-long 
+int, 
+int 
 )
 {
     return ;