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

Render nickname form when entering a room via invitation

Browse Source
This commit is contained in:
JC Brand 2017-05-24 17:18:40 +02:00
parent ebc8d243fa
commit 86dc3800aa
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.md
View File

@ -16,10 +16,11 @@
[jcbrand]
- API change: the `message` event now returns a data object with `stanza` and
`chatbox` attributes, instead of just the stanza. [jcbrand]
- Remove all inline CSS to comply with strict Content-Security-Policy headers [mathiasertl]
- Render nickname form when entering a room via invitation. [jcbrand]
- #567 Unreaded message count reset on page load [novokrest]
- #591 Unread message counter is reset when the chatbox is closed [novokrest]
- #754 Show unread messages next to roster contacts. [jcbrand]
- #864 Remove all inline CSS to comply with strict Content-Security-Policy headers [mathiasertl]
- #873 Inconsistent unread messages count updating [novokrest]
## 3.0.2 (2017-04-23)

9
src/converse-muc.js
View File

@ -1521,14 +1521,14 @@
* chat room with it.
*/
ev.preventDefault();
var $nick = this.$el.find('input[name=nick]');
var nick = $nick.val();
var nick_el = ev.target.nick;
var nick = nick_el.value;
if (!nick) {
$nick.addClass('error');
nick_el.classList.add('error');
return;
}
else {
$nick.removeClass('error');
nick_el.classList.remove('error');
}
this.$el.find('.chatroom-form-container')
.replaceWith('<span class="spinner centered"/>');
@ -2632,7 +2632,6 @@
'id': room_jid,
'jid': room_jid,
'name': Strophe.unescapeNode(Strophe.getNodeFromJid(room_jid)),
'nick': Strophe.unescapeNode(Strophe.getNodeFromJid(_converse.connection.jid)),
'type': 'chatroom',
'box_id': b64_sha1(room_jid),
'password': $x.attr('password')