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

Bugfix. Could not render chat room configuration form.

Browse Source
This commit is contained in:
JC Brand 2014-12-07 11:13:50 +01:00
parent 9359c76c42
commit 3bf5eeb4a8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
converse.js
View File

@ -2410,14 +2410,15 @@
var $form= this.$el.find('form.chatroom-form'),
$stanza = $(stanza),
$fields = $stanza.find('field'),
title = $stanza.find('title').text();
title = $stanza.find('title').text(),
instructions = $stanza.find('instructions').text();
$form.find('span.spinner').remove();
$form.append($('<legend>').text(title));
if (instructions != title) {
$form.append($('<p class="instructions">').text(this.instructions));
if (instructions && instructions != title) {
$form.append($('<p class="instructions">').text(instructions));
}
_.each($fields, function (field) {
$form.append(utils.xForm2webForm(field));
$form.append(utils.xForm2webForm($(field), $stanza));
});
$form.append('<input type="submit" value="'+__('Save')+'"/>');
$form.append('<input type="button" value="'+__('Cancel')+'"/>');

1
docs/CHANGES.rst
View File

@ -5,6 +5,7 @@ Changelog
------------------
* Bugfix. Login panel didn't appear under certain conditions. [jcbrand]
* Bugfix. Error when trying to render chat room configuration form. [jcbrand]
* Text on the registration form was not configurable or i18n aware. [jcbrand]
* #285 With prebind the jid, rid and sid settings were ignored. [jcbrand]