From 0893d7d4ff15423b1855edcb780c06348e85a9be Mon Sep 17 00:00:00 2001
From: pandamicro <lphuabin@gmail.com>
Date: Thu, 19 Nov 2015 17:17:17 +0800
Subject: [PATCH] Fix text color parser for TextField widget

---
 .../js-bindings/script/studio/parsers/uiParser-1.x.js      | 7 +++++++
 web                                                        | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/cocos/scripting/js-bindings/script/studio/parsers/uiParser-1.x.js b/cocos/scripting/js-bindings/script/studio/parsers/uiParser-1.x.js
index c14763e875b7..4f88976592d1 100644
--- a/cocos/scripting/js-bindings/script/studio/parsers/uiParser-1.x.js
+++ b/cocos/scripting/js-bindings/script/studio/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 = [
diff --git a/web b/web
index 9f6553157144..56c240983a8c 160000
--- a/web
+++ b/web
@@ -1 +1 @@
-Subproject commit 9f65531571443d7ea81beb86c3a7b5c2659057d0
+Subproject commit 56c240983a8c7a6b221f840e3c45ed3d733ef102