From 67899677db8bde044284aaec6237559a68a27b6a Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 2 Feb 2014 15:50:07 -0800
Subject: make chat honour the pause key (but we still need to ping the server
 to maintain the in_room status), also the recent change to pull css out of
 the template file used classes instead of ids so none of the styles were
 sticking

---
 view/css/mod_chat.css | 8 ++++----
 view/tpl/chat.tpl     | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'view')

diff --git a/view/css/mod_chat.css b/view/css/mod_chat.css
index 7f33f2c48..ce6e59af1 100644
--- a/view/css/mod_chat.css
+++ b/view/css/mod_chat.css
@@ -1,23 +1,23 @@
- .chatContainer {
+ #chatContainer {
 	 height: 100%;
 	 width: 100%;
  }
  
- .chatTopBar {
+ #chatTopBar {
 	 float: left;
 	 height: 400px;
 	 width: 650px;
 	 overflow-y: auto;
  }
  
- .chatUsers {
+ #chatUsers {
 	 float: right;
 	 width: 120px;
 	 height: 100%;
 	 border: 1px solid #000;
  }
  
- .chatBottomBar {
+ #chatBottomBar {
 	 position: relative;
 	 bottom: 0;
 	 height: 150px;
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index eb98063fa..e4cd1d20b 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -47,8 +47,8 @@ $('#chat-form').submit(function(ev) {
 
 function load_chats() {
 
-	$.get("chatsvc?f=&room_id=" + room_id + '&last=' + last_chat,function(data) {
-		if(data.success) {
+	$.get("chatsvc?f=&room_id=" + room_id + '&last=' + last_chat + ((stopped) ? '&stopped=1' : ''),function(data) {
+		if(data.success && (! stopped)) {
 			update_inroom(data.inroom);
 			update_chats(data.chats);
 		}
-- 
cgit v1.2.3