Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Initial work on showing unread messages indicator for chat rooms

Browse Source
This commit is contained in:
JC Brand 2017-05-15 19:08:08 +02:00
parent 443b67012d
commit 023a68458c
6 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/config.js
View File

@ -151,6 +151,7 @@ require.config({
"room_item": "src/templates/room_item",
"room_panel": "src/templates/room_panel",
"rooms_list": "src/templates/rooms_list",
"rooms_list_item": "src/templates/rooms_list_item",
"roster": "src/templates/roster",
"roster_filter": "src/templates/roster_filter",
"roster_item": "src/templates/roster_item",

1
src/converse-bookmarks.js
View File

@ -421,7 +421,6 @@
var div = document.createElement('div');
div.innerHTML = tpl_bookmark({
'bookmarked': true,
'can_leave_room': false,
'info_leave_room': __('Leave this room'),
'info_remove': __('Remove this bookmark'),
'info_remove_bookmark': __('Unbookmark this room'),

12
src/converse-roomslist.js
View File

@ -13,10 +13,10 @@
define(["utils",
"converse-core",
"converse-muc",
"tpl!bookmark",
"tpl!rooms_list"
"tpl!rooms_list",
"tpl!rooms_list_item"
], factory);
}(this, function (utils, converse, muc, tpl_bookmark, tpl_rooms_list) {
}(this, function (utils, converse, muc, tpl_rooms_list, tpl_rooms_list_item) {
var $ = converse.env.jQuery,
Backbone = converse.env.Backbone,
b64_sha1 = converse.env.b64_sha1,
@ -50,6 +50,7 @@
this.model.on('add', this.renderRoomsListElement, this);
this.model.on('change:bookmarked', this.renderRoomsListElement, this);
this.model.on('change:name', this.renderRoomsListElement, this);
this.model.on('change:num_unread', this.renderRoomsListElement, this);
this.model.on('remove', this.removeRoomsListElement, this);
var cachekey = 'converse.roomslist'+_converse.bare_jid;
@ -117,8 +118,7 @@
name = item.get('name');
}
var div = document.createElement('div');
div.innerHTML = tpl_bookmark(_.extend(item.toJSON(), {
'can_leave_room': true,
div.innerHTML = tpl_rooms_list_item(_.extend(item.toJSON(), {
'info_leave_room': __('Leave this room'),
'info_remove_bookmark': __('Unbookmark this room'),
'info_title': __('Show more information on this room'),
@ -177,7 +177,7 @@
_converse.rooms_list_view.render();
}
};
_converse.on('reconnected', afterReconnection);
_converse.api.listen.on('reconnected', afterReconnection);
}
});
}));

4
src/converse-rosterview.js
View File

@ -937,9 +937,7 @@
* to be cleared, but if chatbox is scrolled up, then num_unread should not be cleared.
*/
var chatbox = chatboxview.model;
if (chatbox.get('type') === 'chatroom') {
// TODO
} else {
if (chatbox.get('type') !== 'chatroom') {
var contact = _.head(_converse.roster.where({'jid': chatbox.get('jid')}));
if (!_.isUndefined(contact) && !chatbox.isScrolledUp()) {
contact.save({'num_unread': 0});

4
src/templates/bookmark.html
View File

@ -1,9 +1,5 @@
<dd class="available-chatroom" data-room-jid="{{{jid}}}">
<a class="open-room" data-room-jid="{{{jid}}}" title="{{{open_title}}}" href="#">{{{name}}}</a>
{[ if (can_leave_room) { ]}
<a class="right close-room icon-remove"
data-room-jid="{{{jid}}}" title="{{{info_leave_room}}}" href="#">&nbsp;</a>
{[ } ]}
<a class="right remove-bookmark icon-pushpin {[ if (bookmarked) { ]} button-on {[ } ]}"
data-room-jid="{{{jid}}}" data-bookmark-name="{{{name}}}"
title="{{{info_remove_bookmark}}}" href="#">&nbsp;</a>

14
src/templates/rooms_list_item.html Normal file
View File

@ -0,0 +1,14 @@
<dd class="available-chatroom {[ if (num_unread) { ]} unread-msgs {[ } ]}" data-room-jid="{{{jid}}}">
{[ if (num_unread) { ]}
<span class="pulse"></span>
<span class="msgs-indicactor">{{{ num_unread }}}</span>
{[ } ]}
<a class="open-room" data-room-jid="{{{jid}}}" title="{{{open_title}}}" href="#">{{{name}}}</a>
<a class="right close-room icon-remove"
data-room-jid="{{{jid}}}" title="{{{info_leave_room}}}" href="#">&nbsp;</a>
<a class="right remove-bookmark icon-pushpin {[ if (bookmarked) { ]} button-on {[ } ]}"
data-room-jid="{{{jid}}}" data-bookmark-name="{{{name}}}"
title="{{{info_remove_bookmark}}}" href="#">&nbsp;</a>
<a class="right room-info icon-room-info" data-room-jid="{{{jid}}}"
title="{{{info_title}}}" href="#">&nbsp;</a>
</dd>