From 41b7110554c6ea70baaf548b6066d78b540cd451 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=BF=E5=8F=AC=E9=98=B3?= <zhaoyang.su@yolu-inc.com>
Date: Fri, 7 Nov 2014 16:12:45 +0800
Subject: [PATCH] bug fix

---
 webroot/AutoSa/static/js/main.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/webroot/AutoSa/static/js/main.js b/webroot/AutoSa/static/js/main.js
index 4d4948ca..6258f56a 100644
--- a/webroot/AutoSa/static/js/main.js
+++ b/webroot/AutoSa/static/js/main.js
@@ -44,7 +44,9 @@ $.fn.webSocket = function(opt){
             //告诉服务器端有用户登录
             socket.emit('login', {userid:message.id, filename:message.filename});
             socket.on('message',function(obj){
-                tag.append('<p>'+escapeString(obj.content)+'</p>');
+                //去除log中的颜色控制字符
+                var regx =  /\x1B\[([0-9]{1,3}((;[0-9]{1,3})*)?)?[m|K]/g;
+                tag.append('<p>'+escapeString(obj.content.replace(regx,''))+'</p>');
             });
             return tag[0];
         } ,
-- 
2.18.0