X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=public%2Fscripts%2Fchatclient.js;h=3e93823d0e2b41532b60f17af6a98db19690767e;hb=f5dbf792c714c02a73f68bb3ff16fd38d622797b;hp=f87a2935af2d2d87c2d7fce7fa55ee1dfeb47318;hpb=87858ba66d7bf35b6de0c6917fbaf774e4cb9afc;p=webchat%2FWebChat.git

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