From 18ce551602d9cb2ef66e1e595d06ffb43dd4b538 Mon Sep 17 00:00:00 2001 From: franzz Date: Tue, 16 Sep 2014 20:42:52 +0200 Subject: [PATCH] fix unread_msg variable in chat --- inc/databap.php | 4 ++-- masks/chat.html | 26 +++++++++++++------------- style/screen.css | 14 +++++++++++++- 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/inc/databap.php b/inc/databap.php index 736f78c..a36a3ee 100644 --- a/inc/databap.php +++ b/inc/databap.php @@ -7,8 +7,8 @@ class Databap extends PhpObject { //Common Constants - const VERSION = '1.0.0'; //Versioning: ..- - const VERSION_DATE = '13/09/2014'; + const VERSION = '1.0.1'; //Versioning: ..- + const VERSION_DATE = '16/09/2014'; const EXPECTED_PAGE_COOKIE = 'exp_page'; const MAIN_SEPARATOR = ' '; const DATE_FORMAT = 'd/m/Y'; diff --git a/masks/chat.html b/masks/chat.html index 9c55bde..5b027ac 100755 --- a/masks/chat.html +++ b/masks/chat.html @@ -79,7 +79,7 @@ databap.pageInit = function() //Page variables self.tmp('sending_msg', 'boolean'); self.tmp('refresh', 'boolean'); - self.vars2('unread_msg', 'object'); + self.tmp('unread_msg', 'object'); self.tmp('news_period', 10*60*1000); self.tmp('get_news', false); self.tmp('last_message_id', '0'); @@ -104,7 +104,7 @@ databap.pageInit = function() //Loading Chans setChanButton(); databap.vars.chans_list[databap.consts.all_chan_id] = databap.consts.all_chan_text; - databap.vars.unread_msg[databap.consts.all_chan_text] = 0; + databap.tmp(['unread_msg', databap.consts.all_chan_text], 0); joinChan(databap.consts.default_chan, true); //window focus @@ -226,9 +226,6 @@ function getNews() function onPageFocus() { databap.vars.focus=true; - //iUnreadMessages -= databap.vars.unread_msg[currentChan()]; - //databap.setTitle(); - //debug('focused '+databap.vars.focus); switchChan(); } function onPageBlur() @@ -377,8 +374,8 @@ function switchChan(sChanKeyName) //Unread msg if(databap.vars.focus) { - databap.vars.unread_msg[sChanName] = 0; - databap.vars.unread_msg[databap.consts.all_chan_text] = 0; + databap.tmp(['unread_msg', sChanName], 0); + databap.tmp(['unread_msg', databap.consts.all_chan_text], 0); } syncUnreadMsg(); @@ -402,14 +399,14 @@ function syncUnreadMsg() var iCountUnread = 0; $.each ( - databap.vars.unread_msg, + databap.tmp('unread_msg'), function(sChanName, iUnreadMsg) { iCountUnread += iUnreadMsg; } ); databap.setTitle((iCountUnread>0)?iCountUnread+' msg':''); - + //Chan unread messages var sChanUnreadId = ''; var sUnreadText = ''; @@ -420,7 +417,7 @@ function syncUnreadMsg() function(sChanKeyName, sChanName) { sChanUnreadId = databap.consts.chanUnreadPrefix+sChanKeyName; - iCountUnread = databap.vars.unread_msg[sChanName]; + iCountUnread = databap.tmp(['unread_msg', sChanName]); sUnreadText = (iCountUnread > 0 && sChanName != currentChan())?'('+iCountUnread+')':''; databap.getMainElem('#'+sChanUnreadId).text(sUnreadText); } @@ -432,7 +429,7 @@ function addChanTab(sChanKeyName, sChanName, sChanTabName, bLightUp) //Add channel to list sChanTabName = sChanTabName || sChanName; databap.vars.chans_list[sChanKeyName] = sChanName; - databap.vars.unread_msg[sChanName] = 0; + databap.tmp(['unread_msg', sChanName], 0); //Add channel tab var sChanId = databap.consts.chanPrefix+sChanKeyName; @@ -659,7 +656,8 @@ function refresh_chat(bReset) 'messages', function(result) { - var prevLastMsgId = self.tmp('last_message_id');; + var prevLastMsgId = self.tmp('last_message_id'); + var sUnreadChanName, iUnreadCount; updateUsersList = false; if(prevLastMsgId < result.last_message_id || bReset) { @@ -675,7 +673,9 @@ function refresh_chat(bReset) addMessage(message_info, bReset); if(!bReset && message_info.msg_class!='C' /* && message_info.id_user!=databap.vars.user_id */) { - databap.vars.unread_msg[getChanName(message_info.id_chan)]++; + sUnreadChanName = getChanName(message_info.id_chan); + iUnreadCount = databap.tmp(['unread_msg', sUnreadChanName]) || 0; + databap.tmp(['unread_msg', sUnreadChanName], iUnreadCount++); } } ); diff --git a/style/screen.css b/style/screen.css index 7047673..396f378 100644 --- a/style/screen.css +++ b/style/screen.css @@ -6,6 +6,7 @@ SAP Orange: #EFAB00 SAP Bright blue: #D9E5F2 Bright blue 2: #DCF2FB + Bright Orange: #F2E1B5 */ /* General */ @@ -1436,7 +1437,7 @@ vertical-align 0% -5% -10% -15% -20% -25% -30% padding:2px 5px; font-weight:bold; border:1px solid #04357B; - + cursor:pointer; background: #FFFFFF; background: -moz-linear-gradient(top, #FFFFFF 15%, #D9E5F2 85%); background: -webkit-gradient(linear, left top, left bottom, color-stop(15%,#FFFFFF), color-stop(85%,#D9E5F2)); @@ -1446,6 +1447,17 @@ vertical-align 0% -5% -10% -15% -20% -25% -30% background: linear-gradient(to bottom, #FFFFFF 15%,#D9E5F2 85%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFFFFF', endColorstr='#D9E5F2',GradientType=0 ); } +#welcome span.milestone:hover { + color:#EFAB00; + border-color:#EFAB00; + background: -moz-linear-gradient(top, #FFFFFF 15%, #F2E1B5 85%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(15%,#FFFFFF), color-stop(85%,#F2E1B5)); + background: -webkit-linear-gradient(top, #FFFFFF 15%,#F2E1B5 85%); + background: -o-linear-gradient(top, #FFFFFF 15%,#F2E1B5 85%); + background: -ms-linear-gradient(top, #FFFFFF 15%,#F2E1B5 85%); + background: linear-gradient(to bottom, #FFFFFF 15%,#F2E1B5 85%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFFFFF', endColorstr='#F2E1B5',GradientType=0 ); +} #welcome span.milestone .fa { margin-right:5px; }