Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 01:58:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix stop of timer is done also when checks fail

Browse Source
This commit is contained in:
Laurent Destailleur
2023-02-10 19:19:11 +01:00
parent 4a6069a545
commit 78201454e8
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/core/js/lib_notification.js.php
View File

@@ -102,6 +102,9 @@ function first_execution() {
}
function check_events() {
var result = 0;
dolnotif_nb_test_for_page += 1;
if (Notification.permission === "granted") {
var currentToken = 'notrequired';
const allMeta = document.getElementsByTagName("meta");
@@ -112,7 +115,6 @@ function check_events() {
}
}
time_js_next_test += time_auto_update;
dolnotif_nb_test_for_page += 1;
console.log("Call ajax to check events with time_js_next_test = "+time_js_next_test+" dolnotif_nb_test_for_page="+dolnotif_nb_test_for_page);
@@ -195,17 +197,19 @@ function check_events() {
}
});
if (dolnotif_nb_test_for_page > 5) {
console.log("We did "+dolnotif_nb_test_for_page+" consecutive test on this page. We stop checking now from here by clearing dolnotif_idinterval="+dolnotif_idinterval);
clearInterval(dolnotif_idinterval);
}
return 1;
result = 1;
} else {
console.log("Cancel check_events. Check is useless because javascript Notification.permission is "+Notification.permission+" (blocked manualy or web site is not https).");
console.log("Cancel check_events() with dolnotif_nb_test_for_page="+dolnotif_nb_test_for_page+". Check is useless because javascript Notification.permission is "+Notification.permission+" (blocked manualy or web site is not https).");
return 2; // We return a positive so the repeated check will done even if authroization is not yet allowed may be after this check)
result = 2; // We return a positive so the repeated check will done even if authroization is not yet allowed may be after this check)
}
if (dolnotif_nb_test_for_page > 5) {
console.log("We did "+dolnotif_nb_test_for_page+" consecutive test on this page. We stop checking now from here by clearing dolnotif_idinterval="+dolnotif_idinterval);
clearInterval(dolnotif_idinterval);
}
return result;
}
<?php