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

fix unread on invites

Browse Source
This commit is contained in:
Franzz
2014-10-27 23:38:49 +01:00
parent d86bd2cc31
commit ccfe202bd6
7 changed files with 149 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
masks/chat.html
View File

@@ -659,7 +659,6 @@ function refresh_chat(bReset)
function(result)
{
var prevLastMsgId = self.tmp('last_message_id');
var sUnreadChanName, iUnreadCount;
updateUsersList = false;
if(prevLastMsgId < result.last_message_id || bReset)
{
@@ -673,12 +672,6 @@ function refresh_chat(bReset)
function(id_message, message_info)
{
addMessage(message_info, bReset);
if(!bReset && message_info.msg_class!='C' /* && message_info.id_user!=databap.vars.user_id */)
{
sUnreadChanName = getChanName(message_info.id_chan);
iUnreadCount = (databap.tmp(['unread_msg', sUnreadChanName]) || 0) + 1;
databap.tmp(['unread_msg', sUnreadChanName], iUnreadCount);
}
}
);
@@ -719,6 +712,8 @@ function addMessage(message_info, bReset)
var sChanKeyName = message_info.id_chan;
var sMsgPrefix = '<a class="user clickable" title="Ecrire un PM &agrave; '+message_info.nickname+'">'+message_info.nickname+'</a><span class="console">&gt;</span>';
var msg_body = '';
var sUnreadChanName, iUnreadCount;
var bSystemMsg = false;
switch(message_info.msg_class)
{
@@ -761,6 +756,7 @@ function addMessage(message_info, bReset)
case 'C':
updateUsersList = true;
msg_body = (self.vars2('opt_console')==self.consts.opt_console_no)?'':'<span class="text action">'+message_info.nickname+' '+message_info.message+'</span>';
bSystemMsg = true;
break;
case 'I':
var msg = '<a href="'+message_info.message[3]+'" target="_blank"><img src="'+message_info.message[0]+'" width="'+message_info.message[1]+'" height="'+message_info.message[2]+'" class="proxy"></a>';
@@ -775,10 +771,12 @@ function addMessage(message_info, bReset)
{
msg_body = '<span class="text action">'+message_info.message+'</span>';
setTimeout(databap.refresh, databap.consts.reboot_delay*1000);
bSystemMsg = true;
}
break;
case 'V':
if(!bReset) joinChan(sChanKeyName, false, [], false);
bSystemMsg = true;
break;
case 'B':
var url = databap.getInternalLink('a', message_info.message);
@@ -810,10 +808,19 @@ function addMessage(message_info, bReset)
if(msg_body != '')
{
//Adding message to channel panel
$Message = $('<p class="'+message_info.msg_class+' class_'+sChanKeyName+' hide round_right"></p>').append('<span class="time">'+message_info.time+'</span>', msg_body);
$Message.find('.chan_link').click(function(){joinChan($(this).find('.chan_text').text());});
$Message.find('.user').click(setPm);
databap.getMainElem('#chat_messages').append($Message);
//Unread messages
if(!bReset && !bSystemMsg /* && message_info.id_user!=databap.vars.user_id */)
{
sUnreadChanName = getChanName(message_info.id_chan);
iUnreadCount = (databap.tmp(['unread_msg', sUnreadChanName]) || 0) + 1;
databap.tmp(['unread_msg', sUnreadChanName], iUnreadCount);
}
}
}

8
masks/welcome.html
View File

@@ -10,6 +10,13 @@
<li><i class="fa-li fa fa-c-git"></i>Repo git disponible ici: <a href="http://gitweb.lutran.fr/?p=databap.git;a=shortlog" target="_blank">databap.git</a></li>
</ul>
</li>
<li id="sp_fixes"><i class="fa-li fa fa-30 fa-c-bug"></i>Bug fixes SP <span class="version_sp"></span>
<ul class="fa-ul">
<li><i class="fa-li fa fa-c-checked"></i>Réparation des messages non lus dans le chat</li>
<li><i class="fa-li fa fa-c-checked"></i>Plantage lors de la recherche infructueuse de table</li>
<li><i class="fa-li fa fa-c-checked"></i>Bon rafraichissement de la barre de défilement dans la recherche</li>
</ul>
</li>
<li><i class="fa-li fa fa-30 fa-c-changelog"></i>Changelog <span class="version_main"></span>.<span class="version_ehp"></span>
<ul class="fa-ul">
<li><i class="fa-li fa fa-c-checked"></i>Utilisation des # pour les accès aux pages, compatible avec les boutons prec/suiv des navigateurs. Ex: <a href="#chat">databap.lutran.fr#chat</a></li>
@@ -55,6 +62,7 @@ databap.pageInit = function()
$('.version_main').text(asVersionDetails[0]);
$('.version_ehp').text(asVersionDetails[1]);
$('.version_sp').text(asVersionDetails[2]);
if(asVersionDetails[2]==0) $('#sp_fixes').hide();
$('#version_date').text(databap.consts.version_date);
self.initScrollBar('#main', '#welcome_box', '#welcome_subbox');