franzz/databap
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

unified feedback v1

Browse Source
This commit is contained in:
Franzz
2014-09-01 22:44:34 +02:00
parent 28f2dabde5
commit 93d4ec28cf
5 changed files with 107 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
masks/chat.html
View File

@@ -319,25 +319,33 @@ function joinChan(sChanName, bFirstConn, asAttendees, bSwitchOnJoin)
databap.getInfo
(
'join_chan',
function(result)
function(data)
{
//Add to channels list
var sConnectedChanKeyName = '';
$.each
(
result.channels,
function(iChanId, sReturnedChanName)
{
//Add tab if not already there
if(!getChanName(iChanId)) addChanTab(iChanId, sReturnedChanName, result.channel_tab_names[iChanId], !bSwitchOnJoin);
}
);
//Full reload of messages
refresh_chat(true);
//Switch to the right chan
switchChan(bSwitchOnJoin?result.current_chan_id:null);
debug(data);
if(data.result == databap.consts.error)
{
databap.feedback('error', data.desc);
}
else
{
//Add to channels list
var sConnectedChanKeyName = '';
$.each
(
data.channels,
function(iChanId, sReturnedChanName)
{
//Add tab if not already there
if(!getChanName(iChanId)) addChanTab(iChanId, sReturnedChanName, data.channel_tab_names[iChanId], !bSwitchOnJoin);
}
);
//Full reload of messages
refresh_chat(true);
//Switch to the right chan
switchChan(bSwitchOnJoin?data.current_chan_id:null);
}
},
{chan:sChanName, first_conn:(bFirstConn?1:0), attendees:asAttendees},
'json',
@@ -638,7 +646,6 @@ function refresh_chat(bReset)
{
var prevLastMsgId = self.tmp('last_message_id');;
updateUsersList = false;
databap.resetIcon();
if(prevLastMsgId < result.last_message_id || bReset)
{
//Update last read message id

5
masks/index.html
View File

@@ -62,10 +62,11 @@
</div>
<div id="main_container" class="round">
<div id="page_title">
<div class="h1_wrap side_margins">
<div class="side_margins">
<h1 class="round">
<i class="fa fa-fw fa-20 fa-c-loading fa-spin"></i>
<i id="page_icon" class="fa fa-fw fa-20 fa-c-loading fa-spin"></i>
<span id="title_text">Chargement...</span>
<span id="title_feedback"></span>
</h1>
</div>
</div>