From cd8e7963de598c0929ca654c6ff36d7b87d004d2 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 25 Aug 2020 21:42:59 -0400 Subject: [PATCH] feat: added alert.timeoutfn Also, various alert methods now pass two arguments, alert and params --- public/src/modules/alerts.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/public/src/modules/alerts.js b/public/src/modules/alerts.js index fc7cbe9558b9..89f4840dbca9 100644 --- a/public/src/modules/alerts.js +++ b/public/src/modules/alerts.js @@ -39,7 +39,7 @@ define('alerts', ['translator', 'components', 'benchpress'], function (translato } if (params.timeout) { - startTimeout(alert, params.timeout); + startTimeout(alert, params); } if (typeof params.clickfn === 'function') { @@ -47,7 +47,7 @@ define('alerts', ['translator', 'components', 'benchpress'], function (translato .addClass('pointer') .on('click', function (e) { if (!$(e.target).is('.close')) { - params.clickfn(); + params.clickfn(alert, params); } fadeOut(alert); }); @@ -69,7 +69,7 @@ define('alerts', ['translator', 'components', 'benchpress'], function (translato clearTimeout(parseInt(alert.attr('timeoutId'), 10)); if (params.timeout) { - startTimeout(alert, params.timeout); + startTimeout(alert, params); } alert.children().fadeOut(100); @@ -99,9 +99,15 @@ define('alerts', ['translator', 'components', 'benchpress'], function (translato }); } - function startTimeout(alert, timeout) { + function startTimeout(alert, params) { + var timeout = params.timeout; + var timeoutId = setTimeout(function () { fadeOut(alert); + + if (typeof params.timeoutfn === 'function') { + params.timeoutfn(alert, params); + } }, timeout); alert.attr('timeoutId', timeoutId);