From e73ce3a70224df5d1a5412ed879da237e398707d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Tue, 13 Mar 2018 21:20:43 +0100 Subject: [PATCH] Removing correct amount of events from socket --- server/public/assets/js/channel.js | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/server/public/assets/js/channel.js b/server/public/assets/js/channel.js index 5fccf9dc..2f513368 100644 --- a/server/public/assets/js/channel.js +++ b/server/public/assets/js/channel.js @@ -546,22 +546,23 @@ var Channel = { }); socket.emit("change_channel"); chan = ""; + socket.removeEventListener("np"); + socket.removeEventListener("id"); + socket.removeEventListener(id); //socket.disconnect(); - } else { - socket.removeEventListener("chat.all"); - socket.removeEventListener("chat"); - socket.removeEventListener("conf"); - socket.removeEventListener("pw"); - socket.removeEventListener("toast"); - //socket.removeEventListener("id"); - socket.removeEventListener("channel"); - socket.removeEventListener("auth_required"); - socket.removeEventListener("auth_accepted"); - socket.removeEventListener("suggested"); - socket.removeEventListener("color"); - socket.removeEventListener("chat_history"); - //socket.removeEventListener(id); } + socket.removeEventListener("chat.all"); + socket.removeEventListener("chat"); + socket.removeEventListener("conf"); + socket.removeEventListener("pw"); + socket.removeEventListener("toast"); + //socket.removeEventListener("id"); + socket.removeEventListener("channel"); + socket.removeEventListener("auth_required"); + socket.removeEventListener("auth_accepted"); + socket.removeEventListener("suggested"); + socket.removeEventListener("color"); + socket.removeEventListener("chat_history"); socket.removeEventListener("color"); $.ajax({ url: "/",