Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: hooks for alert animate, no more fadein/fadeout for reconnect alert

Browse Source
This commit is contained in:
Julian Lam
2021-03-23 13:42:13 -04:00
parent d511216c82
commit d9e2029074
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
public/src/modules/alerts.js
View File

@@ -1,7 +1,7 @@
'use strict'; 'use strict';
define('alerts', ['translator', 'components'], function (translator, components) { define('alerts', ['translator', 'components', 'hooks'], function (translator, components, hooks) {
var module = {}; var module = {};
module.alert = function (params) { 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) { translator.translate(alert.html(), function (translatedHTML) {
alert.children().fadeIn(100); alert.children().fadeIn(100);
alert.html(translatedHTML); alert.html(translatedHTML);
$(window).trigger('action:alert.update', { alert: alert, params: params }); hooks.fire('action:alert.update', { alert, params });
}); });
// Handle changes in the clickfn // Handle changes in the clickfn
@@ -118,6 +118,7 @@ define('alerts', ['translator', 'components'], function (translator, components)
alert.css('transition-property', ''); alert.css('transition-property', '');
alert.css('transition', 'width ' + (timeout + 450) + 'ms linear, background-color ' + (timeout + 450) + 'ms ease-in'); alert.css('transition', 'width ' + (timeout + 450) + 'ms linear, background-color ' + (timeout + 450) + 'ms ease-in');
alert.addClass('animate'); alert.addClass('animate');
hooks.fire('action:alert.animate', { alert, params });
}, 50); }, 50);
// Handle mouseenter/mouseleave // Handle mouseenter/mouseleave

8
public/src/sockets.js
View File

@@ -124,11 +124,11 @@ socket = window.socket;
if (reconnecting) { if (reconnecting) {
var reconnectEl = $('#reconnect'); var reconnectEl = $('#reconnect');
var reconnectAlert = $('#reconnect-alert'); var reconnectAlert = document.getElementById('reconnect-alert');
reconnectEl.tooltip('destroy'); reconnectEl.tooltip('destroy');
reconnectEl.html('<i class="fa fa-check text-success"></i>'); reconnectEl.html('<i class="fa fa-check text-success"></i>');
reconnectAlert.fadeOut(500); reconnectAlert.classList.add('hide');
reconnecting = false; reconnecting = false;
reJoinCurrentRoom(); reJoinCurrentRoom();
@@ -180,11 +180,11 @@ socket = window.socket;
function onReconnecting() { function onReconnecting() {
reconnecting = true; reconnecting = true;
var reconnectEl = $('#reconnect'); var reconnectEl = $('#reconnect');
var reconnectAlert = $('#reconnect-alert'); var reconnectAlert = document.getElementById('reconnect-alert');
if (!reconnectEl.hasClass('active')) { if (!reconnectEl.hasClass('active')) {
reconnectEl.html('<i class="fa fa-spinner fa-spin"></i>'); 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({ reconnectEl.addClass('active').removeClass('hide').tooltip({