From d9e202907444562a4d75796d9b3b56b4f6408730 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Tue, 23 Mar 2021 13:42:13 -0400
Subject: [PATCH] fix: hooks for alert animate, no more fadein/fadeout for
 reconnect alert

---
 public/src/modules/alerts.js | 7 ++++---
 public/src/sockets.js        | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/public/src/modules/alerts.js b/public/src/modules/alerts.js
index df9649064c..d9cffeb114 100644
--- a/public/src/modules/alerts.js
+++ b/public/src/modules/alerts.js
@@ -1,7 +1,7 @@
 'use strict';
 
 
-define('alerts', ['translator', 'components'], function (translator, components) {
+define('alerts', ['translator', 'components', 'hooks'], function (translator, components, hooks) {
 	var module = {};
 
 	module.alert = function (params) {
@@ -52,7 +52,7 @@ define('alerts', ['translator', 'components'], function (translator, components)
 					});
 			}
 
-			$(window).trigger('action:alert.new', { alert: alert, params: params });
+			hooks.fire('action:alert.new', { alert, params });
 		});
 	}
 
@@ -74,7 +74,7 @@ define('alerts', ['translator', 'components'], function (translator, components)
 		translator.translate(alert.html(), function (translatedHTML) {
 			alert.children().fadeIn(100);
 			alert.html(translatedHTML);
-			$(window).trigger('action:alert.update', { alert: alert, params: params });
+			hooks.fire('action:alert.update', { alert, params });
 		});
 
 		// Handle changes in the clickfn
@@ -118,6 +118,7 @@ define('alerts', ['translator', 'components'], function (translator, components)
 			alert.css('transition-property', '');
 			alert.css('transition', 'width ' + (timeout + 450) + 'ms linear, background-color ' + (timeout + 450) + 'ms ease-in');
 			alert.addClass('animate');
+			hooks.fire('action:alert.animate', { alert, params });
 		}, 50);
 
 		// Handle mouseenter/mouseleave
diff --git a/public/src/sockets.js b/public/src/sockets.js
index 6c08e91935..0117710faf 100644
--- a/public/src/sockets.js
+++ b/public/src/sockets.js
@@ -124,11 +124,11 @@ socket = window.socket;
 
 		if (reconnecting) {
 			var reconnectEl = $('#reconnect');
-			var reconnectAlert = $('#reconnect-alert');
+			var reconnectAlert = document.getElementById('reconnect-alert');
 
 			reconnectEl.tooltip('destroy');
 			reconnectEl.html('<i class="fa fa-check text-success"></i>');
-			reconnectAlert.fadeOut(500);
+			reconnectAlert.classList.add('hide');
 			reconnecting = false;
 
 			reJoinCurrentRoom();
@@ -180,11 +180,11 @@ socket = window.socket;
 	function onReconnecting() {
 		reconnecting = true;
 		var reconnectEl = $('#reconnect');
-		var reconnectAlert = $('#reconnect-alert');
+		var reconnectAlert = document.getElementById('reconnect-alert');
 
 		if (!reconnectEl.hasClass('active')) {
 			reconnectEl.html('<i class="fa fa-spinner fa-spin"></i>');
-			reconnectAlert.fadeIn(500).removeClass('hide');
+			reconnectAlert.classList.remove('hide');
 		}
 
 		reconnectEl.addClass('active').removeClass('hide').tooltip({