Update JS parser

cocos/scripting/js-bindings/script/studio/parsers/action-2.x.js

@@ -260,6 +260,15 @@
 
                 return frame;
             }
+        },
+        {
+            name: "BlendFunc",
+            handle: function(options){
+                var frame = new ccs.BlendFuncFrame();
+                var blendFunc = options["BlendFunc"];
+                if(blendFunc)
+                    frame.setBlendFunc(new cc.BlendFunc(blendFunc["Src"], blendFunc["Dst"]));
+            }
         }
     ];
 

cocos/scripting/js-bindings/script/studio/parsers/timelineParser-2.x.js

@@ -41,10 +41,11 @@
         },
 
         getNodeJson: function(json){
-            var result = json["Content"]["Content"]["ObjectData"];
-            if(undefined === result)
-                result = json["Content"]["ObjectData"];
-            return result;
+            var content = json["Content"];
+            if(content["ObjectData"])
+                return content["ObjectData"];
+
+            return content["Content"]["ObjectData"];
         },
 
         getClass: function(json){