From 2ed8b4660e5f3a32c18aae0d63876065207d50dc Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Wed, 16 Oct 2019 12:11:59 +0200
Subject: [PATCH] Bugfix. Duplicate rooms-list header

---
 src/converse-bookmark-views.js | 6 ++----
 src/converse-roomslist.js      | 8 +++-----
 src/templates/room_panel.html  | 4 ++--
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/converse-bookmark-views.js b/src/converse-bookmark-views.js
index ee07a141f..91d6f6a23 100644
--- a/src/converse-bookmark-views.js
+++ b/src/converse-bookmark-views.js
@@ -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);
                 }
             },
 
diff --git a/src/converse-roomslist.js b/src/converse-roomslist.js
index 6bde331e2..4943d4743 100644
--- a/src/converse-roomslist.js
+++ b/src/converse-roomslist.js
@@ -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);
                 }
             },
 
diff --git a/src/templates/room_panel.html b/src/templates/room_panel.html
index 1d22eef11..f1371b63c 100644
--- a/src/templates/room_panel.html
+++ b/src/templates/room_panel.html
@@ -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> -->