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

Bugfix. Duplicate rooms-list header

Browse Source
This commit is contained in:
JC Brand 2019-10-16 12:11:59 +02:00
parent 99805d2510
commit 2ed8b4660e
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/converse-bookmark-views.js
View File

@ -259,10 +259,8 @@ converse.plugins.add('converse-bookmark-views', {
insertIntoControlBox () {
const controlboxview = _converse.chatboxviews.get('controlbox');
if (controlboxview !== undefined && !u.rootContains(_converse.root, this.el)) {
const el = controlboxview.el.querySelector('.bookmarks-list');
if (el !== null) {
el.parentNode.replaceChild(this.el, el);
}
const el = controlboxview.el.querySelector('.list-container--bookmarks');
el && el.parentNode.replaceChild(this.el, el);
}
},

8
src/converse-roomslist.js
View File

@ -53,7 +53,7 @@ converse.plugins.add('converse-roomslist', {
_converse.RoomsListView = Backbone.VDOMView.extend({
tagName: 'div',
className: 'open-rooms-list list-container rooms-list-container',
className: 'list-container list-container--openrooms',
events: {
'click .add-bookmark': 'addBookmark',
'click .close-room': 'closeRoom',
@ -111,10 +111,8 @@ converse.plugins.add('converse-roomslist', {
insertIntoControlBox () {
const controlboxview = _converse.chatboxviews.get('controlbox');
if (controlboxview !== undefined && !u.rootContains(_converse.root, this.el)) {
const el = controlboxview.el.querySelector('.open-rooms-list');
if (el !== null) {
el.parentNode.replaceChild(this.el, el);
}
const el = controlboxview.el.querySelector('.list-container--openrooms');
el && el.parentNode.replaceChild(this.el, el);
}
},

4
src/templates/room_panel.html
View File

@ -4,6 +4,6 @@
<a class="controlbox-heading__btn show-list-muc-modal fa fa-list-ul" title="{{{o.title_list_rooms}}}" data-toggle="modal" data-target="#list-chatrooms-modal"></a>
<a class="controlbox-heading__btn show-add-muc-modal fa fa-plus" title="{{{o.title_new_room}}}" data-toggle="modal" data-target="#add-chatrooms-modal"></a>
</div>
<div class="list-container open-rooms-list rooms-list-container"></div>
<div class="list-container bookmarks-list rooms-list-container"></div>
<div class="list-container list-container--openrooms"></div>
<div class="list-container list-container--bookmarks"></div>
<!-- </div> -->