From a45b82f9b910a78951201dea1332e268fdadffed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Thu, 15 Feb 2018 11:17:09 +0100 Subject: [PATCH] Fixed removeAllListeners to be working --- server/public/assets/js/channel.js | 3 ++- server/public/assets/js/frontpage.js | 2 +- server/public/assets/js/functions.js | 21 +++++++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/server/public/assets/js/channel.js b/server/public/assets/js/channel.js index 547053d0..be186815 100644 --- a/server/public/assets/js/channel.js +++ b/server/public/assets/js/channel.js @@ -525,7 +525,8 @@ var Channel = { if(Helper.mobilecheck() || user_auth_avoid) { Helper.log("Removing all listeners"); socket.emit("change_channel"); - socket.removeAllListeners(); + removeAllListeners(); + //socket.removeEventListener(id); //socket.disconnect(); } else { socket.removeEventListener("chat.all"); diff --git a/server/public/assets/js/frontpage.js b/server/public/assets/js/frontpage.js index e5e0b867..63129b24 100755 --- a/server/public/assets/js/frontpage.js +++ b/server/public/assets/js/frontpage.js @@ -298,7 +298,7 @@ var Frontpage = { clearTimeout(rotation_timeout); if(Helper.mobilecheck()){ Helper.log("removing all listeners"); - socket.removeAllListeners(); + removeAllListeners(); } $("#main-container").css("background-color", "#2d2d2d"); if(!Helper.mobilecheck()) { diff --git a/server/public/assets/js/functions.js b/server/public/assets/js/functions.js index 2dc44ea6..f077f53f 100644 --- a/server/public/assets/js/functions.js +++ b/server/public/assets/js/functions.js @@ -1,4 +1,25 @@ +function removeAllListeners() { + Helper.log("Removing all listeners"); + socket.removeEventListener("chat.all"); + socket.removeEventListener("chat"); + socket.removeEventListener("conf"); + socket.removeEventListener("pw"); + socket.removeEventListener("toast"); + socket.removeEventListener("id"); + socket.removeEventListener("channel"); + socket.removeEventListener("np"); + socket.removeEventListener("get_list"); + //socket.removeEventListener("self_ping"); + socket.removeEventListener("viewers"); + socket.removeEventListener("auth_accepted"); + socket.removeEventListener("suggested"); + socket.removeEventListener("color"); + socket.removeEventListener("chat_history"); + //socket.removeEventListener("name"); + socket.removeEventListener(id); +} + function hide_native(way) { if(way == 1){ if(!$('.castButton').hasClass('castButton-white-active')) {