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

Don't query for room features for restored chat rooms.

Browse Source
This commit is contained in:
JC Brand 2017-02-18 17:14:30 +00:00
parent efa8776881
commit 0a99b9f22a
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/converse-muc.js
View File

@ -357,12 +357,18 @@
// Which for some reason doesn't work.
// So working around that fact here:
this.$el.find('.chat-content').on('scroll', this.markScrolled.bind(this));
this.getRoomFeatures().always(function () {
that.join();
that.fetchMessages();
this.registerHandlers();
if (this.model.get('connection_status') !== Strophe.Status.CONNECTED) {
this.getRoomFeatures().always(function () {
that.join();
that.fetchMessages();
_converse.emit('chatRoomOpened', that);
});
} else {
this.fetchMessages();
_converse.emit('chatRoomOpened', that);
});
}
},
render: function () {
@ -1105,7 +1111,6 @@
if (!nick) {
return this.checkForReservedNick();
}
this.registerHandlers();
if (this.model.get('connection_status') === Strophe.Status.CONNECTED) {
// We have restored a chat room from session storage,
// so we don't send out a presence stanza again.