Merge pull request cocos2d#3185 from pandamicro/develop

Fix text color parser for TextField widget

Author: pandamicro

cocos2d/actions/CCActionInstant.js

@@ -660,7 +660,7 @@ cc.CallFunc = cc.ActionInstant.extend(/** @lends cc.CallFunc# */{
         if (selectorTarget) {
             this._selectorTarget = selectorTarget;
         }
-        if (data) {
+        if (data !== undefined) {
             this._data = data;
         }
         return true;

extensions/cocostudio/loader/parsers/uiParser-1.x.js

@@ -662,6 +662,13 @@
         var va = options["vAlignment"];
         if(va)
             widget.setTextVerticalAlignment(va);
+
+        var r = options["colorR"];
+        var g = options["colorG"];
+        var b = options["colorB"];
+        if (r !== undefined && g !== undefined && b !== undefined) {
+            widget.setTextColor(cc.color(r, g, b));
+        }
     };
 
     var register = [