converse-muc: Bugfix.

Switching from bookmarks form to config form shows only spinner.

docs/CHANGES.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.0.4 (Unreleased)
+- Bugfix. Switching from bookmarks form to config form shows only the spinner. [jcbrand]
+- Bugfix. Other room occupants sometimes not shown when reloading the page. [jcbrand]
+
 ## 2.0.3 (2016-11-30)
 - #735 Room configuration button not visible. [jcbrand]
 - CSS fix for fadeIn animation. [jcbrand]

src/converse-bookmarks.js

@@ -132,6 +132,8 @@
                 renderBookmarkForm: function () {
                     var $body = this.$('.chatroom-body');
                     $body.children().addClass('hidden');
+                    // Remove any existing forms
+                    $body.find('form.chatroom-form').remove();
                     $body.append(
                         converse.templates.chatroom_bookmark_form({
                             heading: __('Bookmark this room'),

src/converse-muc.js

@@ -888,9 +888,11 @@
                     var that = this,
                         $body = this.$('.chatroom-body');
                     $body.children().addClass('hidden');
+                    // Remove any existing forms
+                    $body.find('form.chatroom-form').remove();
                     $body.append(converse.templates.chatroom_form());
 
-                    var $form = this.$el.find('form.chatroom-form'),
+                    var $form = $body.find('form.chatroom-form'),
                         $fieldset = $form.children('fieldset:first'),
                         $stanza = $(stanza),
                         $fields = $stanza.find('field'),