r4sas/webogram-i2p
1
0
Fork 0
Code Issues Releases Wiki Activity

Improved grouping messages

Browse Source 
Now displaying unread icon for grouped messages
Increase group timeout to 5 minutes:
https://github.com/zhukov/webogram/issues/177#issuecomment-42838841
This commit is contained in:
Igor Zhukov 2014-05-14 20:59:49 +04:00
parent 8f44739a64
commit ff42a0090e
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/css/app.css
View File

@ -1317,7 +1317,6 @@ a.im_dialog:hover .im_dialog_date {
margin-top: 4px; margin-top: 4px;
} }
.im_message_grouped .icon-message-status { .im_message_grouped .icon-message-status {
display: none;
margin-top: 5px; margin-top: 5px;
margin-left: 24px; margin-left: 24px;
} }
@ -2915,12 +2914,6 @@ a.contacts_modal_contact:hover .contacts_modal_contact_status {
} }
@media (max-width: 900px) { @media (max-width: 900px) {
/*.icon-message-status {
margin-left: 0;
margin-top: 18px;
right: -1px;
}*/
.icon-message-status { .icon-message-status {
z-index: 10; z-index: 10;
margin-left: -5px; margin-left: -5px;
@ -2931,10 +2924,10 @@ a.contacts_modal_contact:hover .contacts_modal_contact_status {
margin-top: 1px; margin-top: 1px;
border: 0; border: 0;
} }
/*.icon-message-status { .im_message_grouped .icon-message-status {
z-index: 10; margin-top: -8px;
margin-left: -15px; margin-left: 32px;
}*/ }
} }
@media (max-width: 480px) { @media (max-width: 480px) {

2
app/js/controllers.js
View File

@ -544,7 +544,7 @@ angular.module('myApp.controllers', [])
curMessage = $scope.history[i]; curMessage = $scope.history[i];
if (prevMessage && if (prevMessage &&
curMessage.from_id == prevMessage.from_id && curMessage.from_id == prevMessage.from_id &&
curMessage.date < prevMessage.date + 30 && curMessage.date < prevMessage.date + 300 &&
!prevMessage.action && !prevMessage.action &&
!curMessage.action && !curMessage.action &&
!prevMessage.fwd_from_id && !prevMessage.fwd_from_id &&