From 0560ccaf177ebb24743bce08ef14c73cc1b24079 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 15:33:41 +0800
Subject: [PATCH] bug fix'

---
 webroot/AutoSa/static/js/main.js      | 13 +++++++------
 webroot/AutoSa/templates/logView.html |  1 +
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/webroot/AutoSa/static/js/main.js b/webroot/AutoSa/static/js/main.js
index a5b383bdf..6bc3aa386 100644
--- a/webroot/AutoSa/static/js/main.js
+++ b/webroot/AutoSa/static/js/main.js
@@ -34,6 +34,12 @@ $.fn.webSocket = function(opt){
         message.id = genUid();
         message.filename = node.attr('filename');
         BootstrapDialog.show({message:function(){
+            var escape = function (html){
+                var elem = document.createElement('div')
+                var txt = document.createTextNode(html)
+                elem.appendChild(txt)
+                return elem.innerHTML;
+            }
             var tag = $('<div id="log" style="height:300px;"></div>');
             //告诉服务器端有用户登录
             socket.emit('login', {userid:message.id, filename:message.filename});
@@ -47,12 +53,7 @@ $.fn.webSocket = function(opt){
         }});
     }
 
-    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);
         return false;
diff --git a/webroot/AutoSa/templates/logView.html b/webroot/AutoSa/templates/logView.html
index 51ea713b3..7a3806aee 100644
--- a/webroot/AutoSa/templates/logView.html
+++ b/webroot/AutoSa/templates/logView.html
@@ -46,6 +46,7 @@
                 }});
                return false;
             })
+           $(".monitor").webSocket()
         </script>
     <!--<button class="btn btn-primary">删除</button>-->
     </form>