From 1c9359bb4cf9bfdb79465bb2f73f2576d279447f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=BF=E5=8F=AC=E9=98=B3?= Date: Fri, 7 Nov 2014 14:27:05 +0800 Subject: [PATCH] bug fix --- webroot/AutoSa/static/js/main.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/webroot/AutoSa/static/js/main.js b/webroot/AutoSa/static/js/main.js index ccc137cbe..fd765c7de 100644 --- a/webroot/AutoSa/static/js/main.js +++ b/webroot/AutoSa/static/js/main.js @@ -32,13 +32,24 @@ $.fn.webSocket = function(opt){ message.id = genUid(); message.filename = node.attr('filename'); + BootstrapDialog.show({message:'
'}); + var socket = io.connect('ws://172.10.10.9:3000'); + + //告诉服务器端有用户登录 socket.emit('login', {userid:message.id, filename:message.filename}); socket.on('message',function(obj){ - window.console.log(obj.content); + $('#log').append(this.escape(obj.content)); }); } + + var escape = function (html){ + var elem = document.createElement('div') + var txt = document.createTextNode(html) + elem.appendChild(txt) + return elem.innerHTML; + } $this.on("click",function(e){ init(e); });