Commit 1b434dbe authored by JC Brand's avatar JC Brand

Updates #723 and #734.

`converse.rooms.open` ignored the `muc_nickname_from_jid` setting.
parent 182dc55f
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
Instead, `converse.initialize` returns a promise which will resolve once Instead, `converse.initialize` returns a promise which will resolve once
initialization is complete. [jcbrand] initialization is complete. [jcbrand]
- New event ['reconnecting'](https://conversejs.org/docs/html/development.html#reconnecting) [jcbrand] - New event ['reconnecting'](https://conversejs.org/docs/html/development.html#reconnecting) [jcbrand]
- #723, #734: Bugfix. `converse.rooms.open` ignored the `muc_nickname_from_jid` setting. [jcbrand]
## 2.0.1 (2016-11-07) ## 2.0.1 (2016-11-07)
- #203 New configuration setting [muc_domain](https://conversejs.org/docs/html/configuration.html#muc_domain) [jcbrand] - #203 New configuration setting [muc_domain](https://conversejs.org/docs/html/configuration.html#muc_domain) [jcbrand]
......
...@@ -1831,7 +1831,7 @@ ...@@ -1831,7 +1831,7 @@
attrs = {}; attrs = {};
} }
var fetcher = converse.chatboxviews.showChat.bind(converse.chatboxviews); var fetcher = converse.chatboxviews.showChat.bind(converse.chatboxviews);
if (!attrs.nick) { if (!attrs.nick && converse.muc_nickname_from_jid) {
attrs.nick = Strophe.getNodeFromJid(converse.bare_jid); attrs.nick = Strophe.getNodeFromJid(converse.bare_jid);
} }
if (typeof jids === "undefined") { if (typeof jids === "undefined") {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment