Browse Source

Bugfix. Duplicate rooms-list header

JC Brand 5 years ago
parent
commit
2ed8b4660e
3 changed files with 7 additions and 11 deletions
  1. 2 4
      src/converse-bookmark-views.js
  2. 3 5
      src/converse-roomslist.js
  3. 2 2
      src/templates/room_panel.html

+ 2 - 4
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);
                 }
             },
 

+ 3 - 5
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);
                 }
             },
 

+ 2 - 2
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> -->