Commit eefce828 authored by JC Brand's avatar JC Brand

Fix tests but killing zombies.

parent 5124c05f
...@@ -1455,9 +1455,7 @@ ...@@ -1455,9 +1455,7 @@
}, },
minimize: function (ev) { minimize: function (ev) {
if (ev && ev.preventDefault) { if (ev && ev.preventDefault) { ev.preventDefault(); }
ev.preventDefault();
}
// Minimizes a chat box // Minimizes a chat box
this.model.minimize(); this.model.minimize();
this.$el.hide('fast', converse.refreshwebkit); this.$el.hide('fast', converse.refreshwebkit);
...@@ -4509,6 +4507,17 @@ ...@@ -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._initialize = function () {
this.chatboxes = new this.ChatBoxes(); this.chatboxes = new this.ChatBoxes();
this.chatboxviews = new this.ChatBoxViews({model: this.chatboxes}); this.chatboxviews = new this.ChatBoxViews({model: this.chatboxes});
......
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
}; };
utils.initConverse = function () { utils.initConverse = function () {
converse._tearDown();
converse._initialize(); converse._initialize();
converse.onConnected();
}; };
utils.initRoster = function () { utils.initRoster = function () {
......
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