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

Fix closing of controlbox without a connection being present

Browse Source
This commit is contained in:
JC Brand 2013-04-01 19:53:39 +02:00
parent aa09ea58cd
commit 54554e94ed
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
converse.js
View File

@ -479,7 +479,11 @@
}, },
closeChat: function () { closeChat: function () {
this.model.destroy(); if (xmppchat.connection) {
this.model.destroy();
} else {
this.model.trigger('hide');
}
}, },
initialize: function (){ initialize: function (){
@ -741,6 +745,9 @@
this.model.on('destroy', $.proxy(function (model, response, options) { this.model.on('destroy', $.proxy(function (model, response, options) {
this.$el.hide('fast'); this.$el.hide('fast');
}, this)); }, this));
this.model.on('hide', $.proxy(function (model, response, options) {
this.$el.hide('fast');
}, this));
if (this.model.get('visible')) { if (this.model.get('visible')) {
this.show(); this.show();
@ -1875,10 +1882,14 @@
$toggle.bind('click', $.proxy(function (e) { $toggle.bind('click', $.proxy(function (e) {
e.preventDefault(); e.preventDefault();
var controlbox = this.chatboxes.get('controlbox');
if ($("div#controlbox").is(':visible')) { if ($("div#controlbox").is(':visible')) {
this.chatboxes.get('controlbox').destroy(); if (this.connection) {
controlbox.destroy();
} else {
controlbox.trigger('hide');
}
} else { } else {
var controlbox = this.chatboxes.get('controlbox');
if (!controlbox) { if (!controlbox) {
controlbox = this.chatboxes.add({ controlbox = this.chatboxes.add({
id: 'controlbox', id: 'controlbox',