Refactor to store number of unread messages
This commit is contained in:
JC Brand
parent
4b8196cd7e
commit
27cce2c229
48
converse.js
48
converse.js
@ -653,18 +653,20 @@
|
||||
b64_sha1('converse.messages'+this.get('jid')+converse.bare_jid));
|
||||
|
||||
this.save({
|
||||
'user_id' : Strophe.getNodeFromJid(this.get('jid')),
|
||||
'box_id' : b64_sha1(this.get('jid')),
|
||||
'otr_status': this.get('otr_status') || UNENCRYPTED,
|
||||
'height': height,
|
||||
'minimized': this.get('minimized') || false,
|
||||
'otr_status': this.get('otr_status') || UNENCRYPTED,
|
||||
'time_minimized': this.get('time_minimized') || moment(),
|
||||
'time_opened': this.get('time_opened') || moment().valueOf(),
|
||||
'height': height
|
||||
'user_id' : Strophe.getNodeFromJid(this.get('jid')),
|
||||
'num_unread': this.get('num_unread') || 0
|
||||
});
|
||||
} else {
|
||||
this.set({
|
||||
'height': height,
|
||||
'time_opened': moment(0).valueOf()
|
||||
'time_opened': moment(0).valueOf(),
|
||||
'num_unread': this.get('num_unread') || 0
|
||||
});
|
||||
}
|
||||
},
|
||||
@ -2621,9 +2623,7 @@
|
||||
},
|
||||
|
||||
initialize: function () {
|
||||
this.model.messages.on('add', function (msg) {
|
||||
this.updateUnreadMessagesCounter(_.clone(msg.attributes));
|
||||
}, this);
|
||||
this.model.messages.on('add', this.updateUnreadMessagesCounter, this);
|
||||
this.model.on('showSentOTRMessage', this.updateUnreadMessagesCounter, this);
|
||||
this.model.on('showReceivedOTRMessage', this.updateUnreadMessagesCounter, this);
|
||||
this.model.on('change:minimized', this.clearUnreadMessagesCounter, this);
|
||||
@ -2645,21 +2645,14 @@
|
||||
},
|
||||
|
||||
clearUnreadMessagesCounter: function () {
|
||||
if (!this.model.get('minimized')) {
|
||||
this.$el.find('.chat-head-message-count').html(0).data('count', 0).hide();
|
||||
}
|
||||
this.model.set({'num_unread': 0});
|
||||
this.render();
|
||||
},
|
||||
|
||||
updateUnreadMessagesCounter: function (msg_dict) {
|
||||
var count, $count;
|
||||
var msg_time = (typeof msg_dict === 'object' && moment(msg_dict.time)) || moment;
|
||||
if (this.model.get('minimized') && (!msg_time.isBefore(this.model.get('time_minimized')))) {
|
||||
$count = this.$el.find('.chat-head-message-count');
|
||||
count = parseInt($count.data('count') || 0, 10) + 1;
|
||||
$count.html(count).data('count', count);
|
||||
if (!$count.is(':visible')) { $count.show('fast'); }
|
||||
}
|
||||
return this;
|
||||
updateUnreadMessagesCounter: function () {
|
||||
var count = this.model.get('num_unread') + 1;
|
||||
this.model.set({'num_unread': count});
|
||||
this.render();
|
||||
},
|
||||
|
||||
close: function (ev) {
|
||||
@ -2693,6 +2686,7 @@
|
||||
this.model.on("add", this.onChanged, this);
|
||||
this.model.on("destroy", this.removeChat, this);
|
||||
this.model.on("change:minimized", this.onChanged, this);
|
||||
this.model.on('change:num_unread', this.updateUnreadMessagesCounter, this);
|
||||
},
|
||||
|
||||
initToggle: function () {
|
||||
@ -2746,6 +2740,13 @@
|
||||
this.remove(item.get('id'));
|
||||
this.toggleview.model.set({'num_minimized': this.keys().length});
|
||||
this.render();
|
||||
},
|
||||
|
||||
updateUnreadMessagesCounter: function () {
|
||||
var ls = this.model.pluck('num_unread'), count = 0;
|
||||
for (i=0; i<ls.length; i++) { count += ls[i]; }
|
||||
this.toggleview.model.set({'num_unread': count});
|
||||
this.render();
|
||||
}
|
||||
});
|
||||
|
||||
@ -2753,7 +2754,8 @@
|
||||
initialize: function () {
|
||||
this.set({
|
||||
'collapsed': this.get('collapsed') || false,
|
||||
'num_minimized': 0
|
||||
'num_minimized': this.get('num_minimized') || 0,
|
||||
'num_unread': this.get('num_unread') || 0,
|
||||
});
|
||||
}
|
||||
});
|
||||
@ -2768,7 +2770,9 @@
|
||||
|
||||
render: function () {
|
||||
this.$el.html(converse.templates.toggle_chats(
|
||||
_.extend(this.model.toJSON(), {'Minimized': __('Minimized')})
|
||||
_.extend(this.model.toJSON(), {
|
||||
'Minimized': __('Minimized')
|
||||
})
|
||||
));
|
||||
if (this.model.get('collapsed')) {
|
||||
this.$flyout.hide();
|
||||
|
||||
@ -857,7 +857,6 @@ dl.add-converse-contact {
|
||||
padding: 2px 4px;
|
||||
font-size: 15px;
|
||||
text-align: center;
|
||||
display: none;
|
||||
position: absolute;
|
||||
right: 22px;
|
||||
bottom: 1px;
|
||||
|
||||
@ -937,7 +937,6 @@ dl.add-converse-contact {
|
||||
padding: 2px 4px;
|
||||
font-size: 15px;
|
||||
text-align: center;
|
||||
display: none;
|
||||
position: absolute;
|
||||
right: 22px;
|
||||
bottom: 1px;
|
||||
|
||||
@ -67,6 +67,7 @@
|
||||
var i, contact_jid, chatview, msg;
|
||||
var sender_jid = mock.cur_names[4].replace(' ','.').toLowerCase() + '@localhost';
|
||||
this.minimized_chats.toggleview.model.set({'collapsed': true});
|
||||
expect(this.minimized_chats.toggleview.$('.unread-message-count').is(':visible')).toBeFalsy();
|
||||
for (i=0; i<3; i++) {
|
||||
contact_jid = mock.cur_names[i].replace(' ','.').toLowerCase() + '@localhost';
|
||||
utils.openChatBoxFor(contact_jid);
|
||||
@ -80,6 +81,8 @@
|
||||
}).c('body').t('This message is sent to a minimized chatbox').up()
|
||||
.c('active', {'xmlns': 'http://jabber.org/protocol/chatstates'}).tree();
|
||||
this.chatboxes.onMessage(msg);
|
||||
expect(this.minimized_chats.toggleview.$('.unread-message-count').is(':visible')).toBeTruthy();
|
||||
expect(this.minimized_chats.toggleview.$('.unread-message-count').text()).toBe(i.toString());
|
||||
}
|
||||
}, converse));
|
||||
|
||||
|
||||
@ -1,2 +1,4 @@
|
||||
{{Minimized}} <span id="minimized-count">({{num_minimized}})</span>
|
||||
<span class="unread-message-count" href="#">0</span>
|
||||
<span class="unread-message-count"
|
||||
{[ if (!num_unread) { ]} style="display: none" {[ } ]}
|
||||
href="#">{{num_unread}}</span>
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
<a class="close-chatbox-button icon-close"></a>
|
||||
<a class="chat-head-message-count" href="#">0</a>
|
||||
<a class="chat-head-message-count"
|
||||
{[ if (!num_unread) { ]} style="display: none" {[ } ]}
|
||||
href="#">{{num_unread}}</a>
|
||||
<div class="chat-title">
|
||||
<a href="#" class="restore-chat" title="{{tooltip}}">
|
||||
{{ title }}
|
||||
|
||||
@ -6,8 +6,6 @@
|
||||
<meta name="description" content="Converse.js: A chat client for your website" />
|
||||
<link rel="shortcut icon" type="image/png" href="components/jasmine/images/jasmine_favicon.png">
|
||||
<link rel="stylesheet" type="text/css" href="components/jasmine/src/html/jasmine.css">
|
||||
<link type="text/css" rel="stylesheet" media="screen" href="http://netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css" />
|
||||
<link type="text/css" rel="stylesheet" media="screen" href="http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css" />
|
||||
<link type="text/css" rel="stylesheet" media="screen" href="css/theme.css" />
|
||||
<link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
|
||||
<script src="main.js"></script>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user