Merge pull request #3227 from VisualSJ/develop-3.10

Parser improvement

Author: pandamicro

Diff for: extensions/cocostudio/loader/parsers/action-2.x.js

@@ -304,6 +304,7 @@
         });
     });
 
+    load.registerParser("action", "2.*", parser);
     load.registerParser("action", "*", parser);
 
 })(ccs._load, ccs._parser);

Diff for: extensions/cocostudio/loader/parsers/timelineParser-2.x.js

@@ -1398,6 +1398,7 @@
     });
 
 
+    load.registerParser("timeline", "2.*", parser);
     load.registerParser("timeline", "*", parser);
 
 

Diff for: extensions/cocostudio/loader/parsers/uiParser-1.x.js

@@ -613,7 +613,7 @@
         if(ph)
             widget.setPlaceHolder(ph);
         widget.setString(options["text"]||"");
-        var fs = options["fontSize1"];
+        var fs = options["fontSize"];
         if(fs)
             widget.setFontSize(fs);
         var fn = options["fontName"];