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

bookmarks: Don't duplicate bookmarks in list.

Browse Source
This commit is contained in:
JC Brand 2017-05-15 17:39:46 +02:00
parent 3343cb6991
commit e49fbc457d
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spec/bookmarks.js
View File

@ -405,7 +405,7 @@
.c('conference', {
'name': 'Bookmark with a very very long name that will be shortened',
'autojoin': 'false',
'jid': 'theplay@conference.shakespeare.lit'
'jid': 'longname@conference.shakespeare.lit'
}).c('nick').t('JC').up().up()
.c('conference', {
'name': 'Another room',

16
src/converse-bookmarks.js
View File

@ -404,14 +404,20 @@
if (item instanceof _converse.ChatBox) {
item = _.head(this.model.where({'jid': item.get('jid')}));
if (_.isNil(item)) {
// A chat box has been closed, but we don't have a
// bookmark for it, so nothing further to do here.
return;
}
}
if (_converse.hide_open_bookmarks &&
_converse.chatboxes.where({'jid': item.get('jid')}).length) {
// A chat box has been opened, and we don't show
// bookmarks for open chats, so we remove it.
this.removeBookmarkListElement(item);
return;
}
var list_el = this.el.querySelector('.bookmarks');
var div = document.createElement('div');
div.innerHTML = tpl_bookmark({
'bookmarked': true,
@ -424,7 +430,15 @@
'name': item.get('name'),
'open_title': __('Click to open this room')
});
this.el.querySelector('.bookmarks').appendChild(div.firstChild);
var el = _.head(sizzle(
'.available-chatroom[data-room-jid="'+item.get('jid')+'"]',
list_el));
if (el) {
el.innerHTML = div.firstChild.innerHTML;
} else {
list_el.appendChild(div.firstChild);
}
this.show();
},