OpenWRT
/
luci
mirror of https://github.com/openwrt/luci.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #7671 from TDT-AG/pr/20250307-luci-base 

luci-base: revert timeout function argument for addNotification
pull/7002/head
Florian Eckert 2025-03-07 14:24:07 +01:00 committed by GitHub
parent 1c4b8dc494 3f832f2512
commit 09590480c4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
modules/luci-base/htdocs/luci-static/resources/ui.js
View File

@ -3848,11 +3848,6 @@ const UI = baseclass.extend(/** @lends LuCI.ui.prototype */ {
* to the `dom.content()` function - refer to its documentation for
* applicable values.
*
* @param {int} [timeout]
* A millisecond value after which the notification will disappear
* automatically. If omitted, the notification will remain until it receives
* the click event.
*
* @param {...string} [classes]
* A number of extra CSS class names which are set on the notification
* banner element.
@ -3860,7 +3855,7 @@ const UI = baseclass.extend(/** @lends LuCI.ui.prototype */ {
* @returns {Node}
* Returns a DOM Node representing the notification banner element.
*/
addNotification(title, children, timeout, ...classes) {
addNotification(title, children, ...classes) {
const mc = document.querySelector('#maincontent') ?? document.body;
const msg = E('div', {
'class': 'alert-message fade-in',
@ -3877,7 +3872,7 @@ const UI = baseclass.extend(/** @lends LuCI.ui.prototype */ {
'class': 'btn',
'style': 'margin-left:auto; margin-top:auto',
'click': function(ev) {
fadeOutNotification(ev.target);
dom.parent(ev.target, '.alert-message').classList.add('fade-out');
},
}, [ _('Dismiss') ])
@ -3893,27 +3888,6 @@ const UI = baseclass.extend(/** @lends LuCI.ui.prototype */ {
mc.insertBefore(msg, mc.firstElementChild);
function fadeOutNotification(element) {
const notification = dom.parent(element, '.alert-message');
if (notification) {
notification.classList.add('fade-out');
notification.classList.remove('fade-in');
setTimeout(() => {
if (notification.parentNode) {
notification.parentNode.removeChild(notification);
}
});
}
}
if (typeof timeout === 'number' && timeout > 0) {
setTimeout(() => {
if (msg && msg.parentNode) {
fadeOutNotification(msg);
}
}, timeout);
}
return msg;
},