kiwix/kiwix-js-pwa
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-js-pwa.git synced 2025-09-09 12:19:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix ability to dismiss upgrade alert

Browse Source 
Fixes #428.
This commit is contained in:
Jaifroid 2023-07-20 16:08:54 +03:00
parent 2908d21ba8
commit 70951184cc
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
www/js/lib/uiUtil.js
View File

@ -367,7 +367,7 @@ function displayActiveContentWarning (type) {
'<b><i>space / </i></b> for the URL Index.&nbsp;[<a id="stop" href="#expertSettingsDiv" class="alert-link">Permanently hide</a>]' + '<b><i>space / </i></b> for the URL Index.&nbsp;[<a id="stop" href="#expertSettingsDiv" class="alert-link">Permanently hide</a>]' +
'</div>'; '</div>';
} }
var alertBoxHeader = document.getElementById('alertBoxHeader'); const alertBoxHeader = document.getElementById('alertBoxHeader');
alertBoxHeader.innerHTML = alertHTML; alertBoxHeader.innerHTML = alertHTML;
alertBoxHeader.style.display = 'block'; alertBoxHeader.style.display = 'block';
document.getElementById('activeContentClose').addEventListener('click', function () { document.getElementById('activeContentClose').addEventListener('click', function () {
@ -769,14 +769,18 @@ function systemAlert (message, label, isConfirm, declineConfirmLabel, approveCon
* @param {String} url An optional download URL * @param {String} url An optional download URL
*/ */
function showUpgradeReady (ver, type, url) { function showUpgradeReady (ver, type, url) {
document.getElementById('alertBoxPersistent').innerHTML = const alertBoxPersistent = document.getElementById('alertBoxPersistent');
alertBoxPersistent.innerHTML =
'<div id="upgradeAlert" class="alert alert-info alert-dismissible">\n' + '<div id="upgradeAlert" class="alert alert-info alert-dismissible">\n' +
' <a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>\n' + ' <a href="#" id="closeUpgradeAlert" class="close" data-dismiss="alert" aria-label="close">&times;</a>\n' +
' <span id="persistentMessage"></span>\n' + ' <span id="persistentMessage"></span>\n' +
'</div>\n'; '</div>\n';
document.getElementById('persistentMessage').innerHTML = 'Version ' + ver + document.getElementById('persistentMessage').innerHTML = 'Version ' + ver +
(url ? ' is available to ' + type + '! Go to <a href="' + url + '" style="color:white;" target="_blank">' + url + '</a>' (url ? ' is available to ' + type + '! Go to <a href="' + url + '" style="color:white;" target="_blank">' + url + '</a>'
: ' is ready to ' + type + '! (Re-launch app to ' + type + '.)'); : ' is ready to ' + type + '! (Re-launch app to ' + type + '.)');
document.getElementById('closeUpgradeAlert').addEventListener('click', function () {
alertBoxPersistent.style.display = 'none';
});
} }
/** /**