改行が含まれるログをうまく送信できないバグを修正した

[webchat/WebChat.git] / public / scripts / chatclient.js

diff --git a/public/scripts/chatclient.js b/public/scripts/chatclient.js
index f87a293..3e93823 100644 (file)
--- a/public/scripts/chatclient.js
+++ b/public/scripts/chatclient.js
@@ -67,21 +67,33 @@ function sendRomCountListerner(count)
 function sendRoomInfoListerner(info)\r
 {\r
        $roominfo = info;\r
-       if(info.type == 0)\r
-       {\r
-               $socket.json.emit("get pastLogList",{rno:document.chat_form.rno.value});\r
-               getCurretLog();\r
-       }else if(info.type == 1){\r
+       var logflag = true;\r
+       var msg = "";\r
+       var adminmsg = "(管理モード)";\r
+       if(info.type == 1){\r
                if(info.IsOwned)\r
-               {\r
-                       $("#enter_message").append($free_password2);\r
-               }else{\r
-                       $("#enter_message").append($free_password1);\r
-               }\r
+                       msg = $free_password2;\r
+               else\r
+                       msg = $free_password1;\r
+               logflag = false;\r
        }else if(info.type == 2){\r
-               $("#enter_message").append($fixed_password);\r
+               msg = $fixed_password;\r
+               logflag = false;\r
        }else if(info.type == 3){\r
-               $("#enter_message").append($hidden_log_to_rom);\r
+               msg = $hidden_log_to_rom;\r
+               logflag = false;\r
+       }\r
+       if(info.admin)\r
+       {\r
+               logflag = true;\r
+               msg += adminmsg;\r
+       }\r
+       if(msg != "")\r
+               $("#enter_message").append(msg);\r
+       if(logflag)\r
+       {\r
+               $socket.json.emit("get pastLogList",{rno:document.chat_form.rno.value});\r
+               getCurretLog();\r
        }\r
 }\r
 \r
@@ -136,7 +148,7 @@ function openPastlogEventListener()
 \r
 function pastLogEventListerner(msg)\r
 {\r
-       if(IsRomMode() && $roominfo.type != 0)\r
+       if(IsRomMode() && $roominfo.type != 0 && $roominfo.admin == false)\r
                return;\r
        for(var i = 0; i < msg.length; i++)\r
                ParseMessage(msg[i]);\r
@@ -145,7 +157,7 @@ function pastLogEventListerner(msg)
 \r
 function getMessageEventListerner(msg)\r
 {\r
-       if(IsRomMode() && $roominfo.type != 0)\r
+       if(IsRomMode() && $roominfo.type != 0 && $roominfo.admin == false)\r
                return;\r
        ParseMessage(msg);\r
        createNameList();\r
@@ -181,6 +193,8 @@ function ParseMessage(msg)
        }else{\r
                ptag.append(msg.name);\r
        }\r
+       if(msg.ip != "")\r
+               ptag.append(" " + msg.ip);\r
        ptag.append(":");\r
        ptag.append(childtag);\r
        ptag.append("(" + $dateFormat.format(date) +")");\r
@@ -248,10 +262,12 @@ function quitEventListener(){
        $("#enter_frame").css("display","block");\r
        $("#chat_frame").css("display","none");\r
 \r
-       if($roominfo.type != 0)\r
+       if($roominfo.type != 0 && $roominfo.admin == false)\r
        {\r
                $("#message").empty();\r
                $("#namelist").empty();\r
+               $names = {};\r
+               createNameList();\r
        }\r
        else\r
                $socket.json.emit("get pastLogList",{rno:document.chat_form.rno.value});\r