From ccfe202bd659d9d70ee7404956873bb77c2ac856 Mon Sep 17 00:00:00 2001 From: franzz Date: Mon, 27 Oct 2014 23:38:49 +0100 Subject: [PATCH] fix unread on invites --- masks/chat.html | 21 +++++--- masks/welcome.html | 8 +++ style/_fa-custom.scss | 4 ++ style/databap.css | 116 +++++++++++++++++++++-------------------- style/databap.css.map | 2 +- style/logon.css | 118 ++++++++++++++++++++++-------------------- style/logon.css.map | 2 +- 7 files changed, 149 insertions(+), 122 deletions(-) mode change 100644 => 100755 style/_fa-custom.scss mode change 100644 => 100755 style/databap.css mode change 100644 => 100755 style/databap.css.map mode change 100644 => 100755 style/logon.css mode change 100644 => 100755 style/logon.css.map diff --git a/masks/chat.html b/masks/chat.html index a2d8aa6..92ab4dd 100755 --- a/masks/chat.html +++ b/masks/chat.html @@ -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 = ''+message_info.nickname+'>'; 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)?'':''+message_info.nickname+' '+message_info.message+''; + bSystemMsg = true; break; case 'I': var msg = ''; @@ -775,10 +771,12 @@ function addMessage(message_info, bReset) { msg_body = ''+message_info.message+''; 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 = $('

').append(''+message_info.time+'', 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); + } } } diff --git a/masks/welcome.html b/masks/welcome.html index e6b0dd3..54253fa 100755 --- a/masks/welcome.html +++ b/masks/welcome.html @@ -10,6 +10,13 @@
  • Repo git disponible ici: databap.git
  • +
  • Bug fixes SP + +
  • Changelog .