Merge pull request #2844 from VisualSJ/develop-particle

Change the parser default value (Button|Label)

Author: pandamicro

extensions/cocostudio/loader/parsers/timelineParser-2.x.js

@@ -524,7 +524,7 @@
         widget.setTextVerticalAlignment(v_alignment);
 
         if(json["OutlineEnabled"] && json["OutlineColor"] && widget.enableOutline)
-            widget.enableOutline(getColor(json["OutlineColor"]), json["OutlineSize"] || 0);
+            widget.enableOutline(getColor(json["OutlineColor"]), getParam(json["OutlineSize"], 1));
 
         if(json["ShadowEnabled"] && json["ShadowColor"] && widget.enableShadow)
             widget.enableShadow(
@@ -610,7 +610,7 @@
             );
         }
         if(label && json["OutlineEnabled"] && json["OutlineColor"] && label.enableOutline)
-            label.enableOutline(getColor(json["OutlineColor"]), json["OutlineSize"] || 0);
+            label.enableOutline(getColor(json["OutlineColor"]), getParam(json["OutlineSize"], 1));
 
         var displaystate = getParam(json["DisplayState"], true);
         widget.setBright(displaystate);