fix receivedMessage datetime bug

maruipp · Dec 24, 2012 · 9176a87 · 9176a87
1 parent c5a8b0a
commit 9176a87
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/server-java/src/org/pushtalk/server/web/template/chatting.html b/server-java/src/org/pushtalk/server/web/template/chatting.html
@@ -160,7 +160,7 @@
 <hr />
 
 <div id="chatPanel">
-	<div id="chatView"></div>
+	<div id="chatView">加载聊天记录中...</div>
 </div>
 <div id="chatActions">
 	<a class="shortcut">^_^</a>
@@ -180,10 +180,6 @@
 </script>
 
 <script>
-<#if channelEntered ??>
-pushtalk.channelUpdated();
-</#if>
-
 $(function() {
 	var exports = window;
 	//请求所需参数
@@ -327,7 +323,8 @@
 					title: msg.title,
 					content: msg.message,
 					channel: msg.extras.channel,
-					status: chatMsgStatus.success
+					status: chatMsgStatus.success,
+					time: differTime + (+new Date)
 				}
 				saveChat(chat);
 
@@ -612,6 +609,10 @@
 		})
 	});
 });
+
+<#if channelEntered ??>
+pushtalk.channelUpdated();
+</#if>
 </script>
 </body>
 </html>