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

controlbox: Only render the contacts panel when connected

Browse Source 
Otherwise it gets rendered multiple times (at least during testing).
This commit is contained in:
JC Brand 2017-05-16 11:54:20 +02:00
parent 8fe7fd2ec2
commit 7c9475e9fc
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/converse-controlbox.js
View File

@ -242,14 +242,17 @@
} else {
this.hide();
}
this.$el.html(tpl_controlbox(
this.el.innerHTML = tpl_controlbox(
_.extend(this.model.toJSON(), {
sticky_controlbox: _converse.sticky_controlbox
}))
);
if (!_converse.connection.connected || !_converse.connection.authenticated || _converse.connection.disconnecting) {
'sticky_controlbox': _converse.sticky_controlbox
}));
if (!_converse.connection.connected ||
!_converse.connection.authenticated ||
_converse.connection.disconnecting) {
this.renderLoginPanel();
} else if (!this.contactspanel || !this.contactspanel.$el.is(':visible')) {
} else if (this.model.get('connected') &&
(!this.contactspanel || !this.contactspanel.$el.is(':visible'))) {
this.renderContactsPanel();
}
return this;