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

Fix tests but killing zombies.

Browse Source
This commit is contained in:
JC Brand 2014-09-17 10:35:24 +02:00
parent 5124c05f65
commit eefce8286e
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
converse.js
View File

@ -1455,9 +1455,7 @@
},
minimize: function (ev) {
if (ev && ev.preventDefault) {
ev.preventDefault();
}
if (ev && ev.preventDefault) { ev.preventDefault(); }
// Minimizes a chat box
this.model.minimize();
this.$el.hide('fast', converse.refreshwebkit);
@ -4509,6 +4507,17 @@
}
};
this._tearDown = function () {
this.features.off().remove();
this.otr.destroy();
this.chatboxes.off().remove();
this.chatboxviews.off().remove();
this.controlboxtoggle.off().remove();
this.minimized_chats.off().remove();
delete this.chatboxes;
delete this.features;
};
this._initialize = function () {
this.chatboxes = new this.ChatBoxes();
this.chatboxviews = new this.ChatBoxViews({model: this.chatboxes});

2
tests/utils.js
View File

@ -31,8 +31,8 @@
};
utils.initConverse = function () {
converse._tearDown();
converse._initialize();
converse.onConnected();
};
utils.initRoster = function () {