Merge pull request #1404 from pandamicro/develop

Fix cocos studio parser issues

Author: pandamicro

frameworks/cocos2d-html5

@@ -59,6 +59,7 @@ bool jsval_to_animationInfo(JSContext* cx, jsval vp, cocostudio::timeline::Anima
 
     JSB_PRECONDITION3(ok, cx, false, "Error processing arguments");
 
+    ret->name = name;
     ret->startIndex = (int)startIndex;
     ret->endIndex = (int)endIndex;
     return true;

frameworks/js-bindings/bindings/manual/cocostudio/jsb_cocos2dx_studio_conversions.cpp

@@ -44,6 +44,12 @@ ccs.InnerActionType = {
     SingleFrame: 2
 };
 
+ccs.AnimationInfo = function (name, startIndex, endIndex) {
+    this.name = name || "";
+    this.startIndex = startIndex != undefined ? startIndex : 0;
+    this.endIndex = endIndex != undefined ? endIndex : 0;
+};
+
 // Armature
 if(ccs.Armature){
     ccs.Armature.prototype.setBody = function( body ) {