diff options
| -rw-r--r-- | include/chat.php | 2 | ||||
| -rw-r--r-- | mod/chatsvc.php | 3 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/tpl/chat.tpl | 35 |
4 files changed, 29 insertions, 13 deletions
diff --git a/include/chat.php b/include/chat.php index aef154fe6..b88c63fc3 100644 --- a/include/chat.php +++ b/include/chat.php @@ -155,7 +155,7 @@ function chatroom_leave($observer_xchan,$room_id,$client) { function chatroom_list($uid) { - $r = q("select cr_name, cr_id, count(cp_id) as cr_inroom from chatroom left join chatpresence on cr_id = cp_room where cr_uid = %d group by cp_id order by cr_name", + $r = q("select cr_name, cr_id, count(cp_id) as cr_inroom from chatroom left join chatpresence on cr_id = cp_room where cr_uid = %d group by cr_name order by cr_name", intval($uid) ); diff --git a/mod/chatsvc.php b/mod/chatsvc.php index 39161b5a7..d76a87462 100644 --- a/mod/chatsvc.php +++ b/mod/chatsvc.php @@ -59,7 +59,8 @@ function chatsvc_post(&$a) { dbesc(datetime_convert()), dbesc($text) ); - + $ret['success'] = true; + json_return_and_die($ret); } function chatsvc_content(&$a) { diff --git a/version.inc b/version.inc index 36c8c7342..e8ad6394a 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-01-29.572 +2014-01-30.573 diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index d0f9418a0..13862c339 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -1,11 +1,12 @@ -<div id="chatContainer"> +<div id="chatContainer" style="height: 100%; width: 100%; position: absolute; right: 0; bottom: 0;"> - <div id="chatTopBar" class="rounded"></div> + <div id="chatTopBar" style="float: left; height: 80%;"></div> <div id="chatLineHolder"></div> - <div id="chatUsers" class="rounded"></div> + <div id="chatUsers" style="float: right; width: 120px; height: 100%; border: 1px solid #000;" ></div> - <div id="chatBottomBar" class="rounded"> + <div class="clear"></div> + <div id="chatBottomBar" style="position: absolute; bottom: 0; height: 150px;"> <div class="tip"></div> <form id="chat-form" method="post" action="#"> @@ -20,24 +21,38 @@ <script> var room_id = {{$room_id}}; +var last_chat = 0; +var chat_timer = null; $('#chat-form').submit(function(ev) { $('body').css('cursor','wait'); $.post("chatsvc", $('#chat-form').serialize(),function(data) { - load_chats(data); + if(chat_timer) clearTimeout(chat_timer); + load_chats(); $('body').css('cursor','auto'); },'json'); ev.preventDefault(); }); -function load_chats(data) { - var chat_data = data; - if(! data) { - $.get("chatsvc?f=&room_id=" + room_id,function(data) { - chat_data = $this; +function load_chats() { + + $.get("chatsvc?f=&room_id=" + room_id + '&last=' + last_chat,function(data) { + if(data.success) { + update_inroom(data.inroom); + update_chats(data.chats); }); } + chat_timer = setTimeout(load_chats,10000); + +} + +function update_inroom(inroom) { } + +function update_chats(chats) { + +} + </script> |