mirror
/
gridtracker
kopia lustrzana https://gitlab.com/gridtracker.org/gridtracker
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Replaced chromium timers with node versions

merge-requests/201/merge
Tag 2022-10-02 11:28:32 -07:00
rodzic 6d529eda48
commit dfb153a613
12 zmienionych plików z 94 dodań i 95 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
package.nw/GridTracker.html
Wyświetl plik

@ -37,6 +37,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<link rel="stylesheet" href="./lib/style.css" /> <link rel="stylesheet" href="./lib/style.css" />
<script src="./lib/defaults.js" type="text/javascript"></script> <script src="./lib/defaults.js" type="text/javascript"></script>
<script src="./lib/protos.js" type="text/javascript"></script> <script src="./lib/protos.js" type="text/javascript"></script>
<script src="./lib/screens.js" type="text/javascript"></script>
<script src="./lib/alerts.js" type="text/javascript"></script> <script src="./lib/alerts.js" type="text/javascript"></script>
<script src="./lib/third-party.js" type="text/javascript"></script> <script src="./lib/third-party.js" type="text/javascript"></script>
<script src="./lib/adif.js" type="text/javascript"></script> <script src="./lib/adif.js" type="text/javascript"></script>
@ -50,7 +51,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<script src="./lib/gtws.js" type="text/javascript"></script> <script src="./lib/gtws.js" type="text/javascript"></script>
<script src="./lib/pota.js" type="text/javascript"></script> <script src="./lib/pota.js" type="text/javascript"></script>
<script src="./lib/gt.js" type="text/javascript"></script> <script src="./lib/gt.js" type="text/javascript"></script>
<script src="./lib/screens.js" type="text/javascript"></script>
</head> </head>
<body id="mainBody" onload="initialDatabases();"> <body id="mainBody" onload="initialDatabases();">
<div id="startupDiv"> <div id="startupDiv">

1
package.nw/gt_bandactivity.html
Wyświetl plik

@ -36,7 +36,6 @@
} }
}); });
</script> </script>
<script src="./lib/screens.js"></script>
</head> </head>
<body <body

2
package.nw/gt_conditions.html
Wyświetl plik

@ -77,7 +77,7 @@
images[i].src = parts[0] + "t=" + now; images[i].src = parts[0] + "t=" + now;
} }
setTimeout(showConditionsBox, 1800000); nodeTimers.setTimeout(showConditionsBox, 1800000);
} }
function init() { function init() {

4
package.nw/lib/adif.js
Wyświetl plik

@ -660,8 +660,8 @@ function grabLOtWLog(test)
if (test == false) if (test == false)
{ {
setTimeout(grabLoTWQSO, 500); nodeTimers.setTimeout(grabLoTWQSO, 500);
setTimeout(grabLoTWQSL, 10000); nodeTimers.setTimeout(grabLoTWQSL, 10000);
} }
} }

8
package.nw/lib/alerts.js
Wyświetl plik

@ -316,12 +316,12 @@ var g_testAudioTimer = null;
function changeAudioValues() function changeAudioValues()
{ {
if (g_testAudioTimer) clearTimeout(g_testAudioTimer); if (g_testAudioTimer) nodeTimers.clearTimeout(g_testAudioTimer);
g_audioSettings.volume = audioVolume.value; g_audioSettings.volume = audioVolume.value;
audioVolumeTd.innerText = parseInt(audioVolume.value * 100) + "%"; audioVolumeTd.innerText = parseInt(audioVolume.value * 100) + "%";
g_testAudioTimer = setTimeout(playTestFile, 200); g_testAudioTimer = nodeTimers.setTimeout(playTestFile, 200);
saveAlertSettings(); saveAlertSettings();
} }
@ -811,13 +811,13 @@ function unflashAlertPopUp()
function displayAlertPopUp(what, message, target) function displayAlertPopUp(what, message, target)
{ {
if (g_alertFlasher) clearTimeout(g_alertFlasher); if (g_alertFlasher) nodeTimers.clearTimeout(g_alertFlasher);
alertPopListDiv.innerHTML = alertPopListDiv.innerHTML =
"<font color='red'><h2>Gathering Alerts<h2></font>"; "<font color='red'><h2>Gathering Alerts<h2></font>";
alertsPopDiv.style.backgroundColor = "#FFF"; alertsPopDiv.style.backgroundColor = "#FFF";
alertsPopDiv.style.display = "inline-block"; alertsPopDiv.style.display = "inline-block";
g_alertFlasher = setTimeout(unflashAlertPopUp, 100); g_alertFlasher = nodeTimers.setTimeout(unflashAlertPopUp, 100);
} }
function ackAlerts() function ackAlerts()

36
package.nw/lib/callsigns.js
Wyświetl plik

@ -92,7 +92,7 @@ function lotwLoadCallsigns()
{ {
var lotwWhenTimer = 86400 * 7 - (now - g_callsignLookups.lotwLastUpdate); var lotwWhenTimer = 86400 * 7 - (now - g_callsignLookups.lotwLastUpdate);
g_lotwWhenDate = now + lotwWhenTimer; g_lotwWhenDate = now + lotwWhenTimer;
g_lotwLoadTimer = setTimeout(lotwDownload, lotwWhenTimer * 1000); g_lotwLoadTimer = nodeTimers.setTimeout(lotwDownload, lotwWhenTimer * 1000);
} }
if (!fs.existsSync(g_lotwFile)) if (!fs.existsSync(g_lotwFile))
@ -131,7 +131,7 @@ function lotwSettingsDisplay()
if (!g_callsignLookups.lotwUseEnable) if (!g_callsignLookups.lotwUseEnable)
{ {
if (g_lotwLoadTimer != null) clearTimeout(g_lotwLoadTimer); if (g_lotwLoadTimer != null) nodeTimers.clearTimeout(g_lotwLoadTimer);
g_lotwLoadTimer = null; g_lotwLoadTimer = null;
g_lotwCallsigns = Object(); g_lotwCallsigns = Object();
} }
@ -194,11 +194,11 @@ function processLotwCallsigns(result, flag)
g_callsignLookups.lotwLastUpdate = timeNowSec(); g_callsignLookups.lotwLastUpdate = timeNowSec();
var now = timeNowSec(); var now = timeNowSec();
if (g_lotwLoadTimer != null) clearTimeout(g_lotwLoadTimer); if (g_lotwLoadTimer != null) nodeTimers.clearTimeout(g_lotwLoadTimer);
var lotwWhenTimer = 86400 * 7 - (now - g_callsignLookups.lotwLastUpdate); var lotwWhenTimer = 86400 * 7 - (now - g_callsignLookups.lotwLastUpdate);
g_lotwWhenDate = now + lotwWhenTimer; g_lotwWhenDate = now + lotwWhenTimer;
g_lotwLoadTimer = setTimeout(lotwDownload, lotwWhenTimer * 1000); g_lotwLoadTimer = nodeTimers.setTimeout(lotwDownload, lotwWhenTimer * 1000);
if (Object.keys(lotwCallsigns).length > 100) if (Object.keys(lotwCallsigns).length > 100)
{ {
@ -218,7 +218,7 @@ function oqrsLoadCallsigns()
{ {
var oqrsWhenTimer = 86400 * 7 - (now - g_callsignLookups.oqrsLastUpdate); var oqrsWhenTimer = 86400 * 7 - (now - g_callsignLookups.oqrsLastUpdate);
g_oqrsWhenDate = now + oqrsWhenTimer; g_oqrsWhenDate = now + oqrsWhenTimer;
g_oqrsLoadTimer = setTimeout(oqrsDownload, oqrsWhenTimer * 1000); g_oqrsLoadTimer = nodeTimers.setTimeout(oqrsDownload, oqrsWhenTimer * 1000);
} }
if (!fs.existsSync(g_oqrsFile)) if (!fs.existsSync(g_oqrsFile))
@ -253,7 +253,7 @@ function oqrsSettingsDisplay()
if (!g_callsignLookups.oqrsUseEnable) if (!g_callsignLookups.oqrsUseEnable)
{ {
if (g_oqrsLoadTimer != null) clearTimeout(g_oqrsLoadTimer); if (g_oqrsLoadTimer != null) nodeTimers.clearTimeout(g_oqrsLoadTimer);
g_oqrsLoadTimer = null; g_oqrsLoadTimer = null;
g_oqrsCallsigns = Object(); g_oqrsCallsigns = Object();
} }
@ -294,11 +294,11 @@ function processoqrsCallsigns(buffer, flag)
g_callsignLookups.oqrsLastUpdate = timeNowSec(); g_callsignLookups.oqrsLastUpdate = timeNowSec();
var now = timeNowSec(); var now = timeNowSec();
if (g_oqrsLoadTimer != null) clearTimeout(g_oqrsLoadTimer); if (g_oqrsLoadTimer != null) nodeTimers.clearTimeout(g_oqrsLoadTimer);
var oqrsWhenTimer = 86400 * 7 - (now - g_callsignLookups.oqrsLastUpdate); var oqrsWhenTimer = 86400 * 7 - (now - g_callsignLookups.oqrsLastUpdate);
g_oqrsWhenDate = now + oqrsWhenTimer; g_oqrsWhenDate = now + oqrsWhenTimer;
g_oqrsLoadTimer = setTimeout(oqrsDownload, oqrsWhenTimer * 1000); g_oqrsLoadTimer = nodeTimers.setTimeout(oqrsDownload, oqrsWhenTimer * 1000);
fs.writeFileSync(g_oqrsFile, JSON.stringify(g_oqrsCallsigns)); fs.writeFileSync(g_oqrsFile, JSON.stringify(g_oqrsCallsigns));
oqrsSettingsDisplay(); oqrsSettingsDisplay();
@ -313,7 +313,7 @@ function eqslLoadCallsigns()
{ {
var eqslWhenTimer = 86400 * 7 - (now - g_callsignLookups.eqslLastUpdate); var eqslWhenTimer = 86400 * 7 - (now - g_callsignLookups.eqslLastUpdate);
g_eqslWhenDate = now + eqslWhenTimer; g_eqslWhenDate = now + eqslWhenTimer;
g_eqslLoadTimer = setTimeout(eqslDownload, eqslWhenTimer * 1000); g_eqslLoadTimer = nodeTimers.setTimeout(eqslDownload, eqslWhenTimer * 1000);
} }
if (!fs.existsSync(g_eqslFile)) if (!fs.existsSync(g_eqslFile))
@ -348,7 +348,7 @@ function eqslSettingsDisplay()
if (!g_callsignLookups.eqslUseEnable) if (!g_callsignLookups.eqslUseEnable)
{ {
if (g_eqslLoadTimer != null) clearTimeout(g_eqslLoadTimer); if (g_eqslLoadTimer != null) nodeTimers.clearTimeout(g_eqslLoadTimer);
g_eqslLoadTimer = null; g_eqslLoadTimer = null;
g_eqslCallsigns = Object(); g_eqslCallsigns = Object();
} }
@ -395,11 +395,11 @@ function processeqslCallsigns(buffer, flag)
g_callsignLookups.eqslLastUpdate = timeNowSec(); g_callsignLookups.eqslLastUpdate = timeNowSec();
var now = timeNowSec(); var now = timeNowSec();
if (g_eqslLoadTimer != null) clearTimeout(g_eqslLoadTimer); if (g_eqslLoadTimer != null) nodeTimers.clearTimeout(g_eqslLoadTimer);
var eqslWhenTimer = 86400 * 7 - (now - g_callsignLookups.eqslLastUpdate); var eqslWhenTimer = 86400 * 7 - (now - g_callsignLookups.eqslLastUpdate);
g_eqslWhenDate = now + eqslWhenTimer; g_eqslWhenDate = now + eqslWhenTimer;
g_eqslLoadTimer = setTimeout(eqslDownload, eqslWhenTimer * 1000); g_eqslLoadTimer = nodeTimers.setTimeout(eqslDownload, eqslWhenTimer * 1000);
if (Object.keys(g_eqslCallsigns).length > 10000) if (Object.keys(g_eqslCallsigns).length > 10000)
{ fs.writeFileSync(g_eqslFile, JSON.stringify(g_eqslCallsigns)); } { fs.writeFileSync(g_eqslFile, JSON.stringify(g_eqslCallsigns)); }
@ -411,7 +411,7 @@ function ulsLoadCallsigns()
{ {
if (g_ulsLoadTimer != null) if (g_ulsLoadTimer != null)
{ {
clearTimeout(g_ulsLoadTimer); nodeTimers.clearTimeout(g_ulsLoadTimer);
g_ulsLoadTimer = null; g_ulsLoadTimer = null;
} }
@ -421,7 +421,7 @@ function ulsLoadCallsigns()
{ {
var ulsWhenTimer = 86400 * 7 - (now - g_callsignLookups.ulsLastUpdate); var ulsWhenTimer = 86400 * 7 - (now - g_callsignLookups.ulsLastUpdate);
g_ulsWhenDate = now + ulsWhenTimer; g_ulsWhenDate = now + ulsWhenTimer;
g_ulsLoadTimer = setTimeout(ulsDownload, ulsWhenTimer * 1000); g_ulsLoadTimer = nodeTimers.setTimeout(ulsDownload, ulsWhenTimer * 1000);
updateCallsignCount(); updateCallsignCount();
} }
} }
@ -507,7 +507,7 @@ function ulsSettingsDisplay()
if (!g_callsignLookups.ulsUseEnable) if (!g_callsignLookups.ulsUseEnable)
{ {
if (g_ulsLoadTimer != null) clearTimeout(g_ulsLoadTimer); if (g_ulsLoadTimer != null) nodeTimers.clearTimeout(g_ulsLoadTimer);
g_ulsLoadTimer = null; g_ulsLoadTimer = null;
g_ulsCallsignsCount = 0; g_ulsCallsignsCount = 0;
ulsCountTd.innerHTML = g_ulsCallsignsCount; ulsCountTd.innerHTML = g_ulsCallsignsCount;
@ -658,7 +658,7 @@ function processulsCallsigns(data, flag, cookies, starting, finished)
{ {
if (starting == true) if (starting == true)
{ {
if (g_ulsLoadTimer != null) clearTimeout(g_ulsLoadTimer); if (g_ulsLoadTimer != null) nodeTimers.clearTimeout(g_ulsLoadTimer);
g_ulsLoadTimer = null; g_ulsLoadTimer = null;
g_ulsWhenDate = 0; g_ulsWhenDate = 0;
g_ulsCallsignsCount = 0; g_ulsCallsignsCount = 0;
@ -708,11 +708,11 @@ function processulsCallsigns(data, flag, cookies, starting, finished)
{ {
var now = timeNowSec(); var now = timeNowSec();
if (g_ulsLoadTimer != null) clearTimeout(g_ulsLoadTimer); if (g_ulsLoadTimer != null) nodeTimers.clearTimeout(g_ulsLoadTimer);
var ulsWhenTimer = 86400 * 7; var ulsWhenTimer = 86400 * 7;
g_ulsWhenDate = ulsWhenTimer + now; g_ulsWhenDate = ulsWhenTimer + now;
g_ulsLoadTimer = setTimeout(ulsDownload, ulsWhenTimer * 1000); g_ulsLoadTimer = nodeTimers.setTimeout(ulsDownload, ulsWhenTimer * 1000);
g_ulsDatabase.transaction(function (tx) g_ulsDatabase.transaction(function (tx)
{ {

98
package.nw/lib/gt.js
Wyświetl plik

@ -1664,9 +1664,9 @@ function timeoutSetUdpPort()
function setUdpPort() function setUdpPort()
{ {
if (g_setNewUdpPortTimeoutHandle != null) { window.clearTimeout(g_setNewUdpPortTimeoutHandle); } if (g_setNewUdpPortTimeoutHandle != null) { nodeTimers.clearTimeout(g_setNewUdpPortTimeoutHandle); }
lastMsgTimeDiv.innerHTML = "..setting.."; lastMsgTimeDiv.innerHTML = "..setting..";
g_setNewUdpPortTimeoutHandle = window.setTimeout(timeoutSetUdpPort, 1000); g_setNewUdpPortTimeoutHandle = nodeTimers.setTimeout(timeoutSetUdpPort, 1000);
} }
function changeGridDecay() function changeGridDecay()
@ -2557,7 +2557,7 @@ function insertMessageInRoster(
{ {
if (g_rosterUpdateTimer != null) if (g_rosterUpdateTimer != null)
{ {
clearTimeout(g_rosterUpdateTimer); nodeTimers.clearTimeout(g_rosterUpdateTimer);
g_rosterUpdateTimer = null; g_rosterUpdateTimer = null;
} }
@ -2585,7 +2585,7 @@ function insertMessageInRoster(
g_callRoster[hash].DXcall = msgDXcallsign; g_callRoster[hash].DXcall = msgDXcallsign;
g_callRoster[hash].DEcall = msgDEcallsign; g_callRoster[hash].DEcall = msgDEcallsign;
g_rosterUpdateTimer = setTimeout(delayedRosterUpdate, 100); g_rosterUpdateTimer = nodeTimers.setTimeout(delayedRosterUpdate, 100);
} }
function delayedRosterUpdate() function delayedRosterUpdate()
@ -4809,21 +4809,11 @@ function changeAnimateSpeedValue()
} }
var g_animateFrame = 0; var g_animateFrame = 0;
var g_nextDimTime = 0; var g_nextDimTime = 0;
var g_last = 0; var g_last = 0;
function animatePaths()
function removeFlightPathsAndDimSquares()
{ {
requestAnimationFrame(animatePaths);
g_last ^= g_last;
if (g_last == 1) return;
g_animateFrame++;
g_animateFrame %= g_mapSettings.animateSpeed;
if (g_animateFrame > 0) return;
for (var i = g_flightPaths.length - 1; i >= 0; i--) for (var i = g_flightPaths.length - 1; i >= 0; i--)
{ {
if (g_flightPaths[i].age < g_timeNow) if (g_flightPaths[i].age < g_timeNow)
@ -4841,6 +4831,19 @@ function animatePaths()
{ {
dimGridsquare(); dimGridsquare();
} }
}
function animatePaths()
{
requestAnimationFrame(animatePaths);
g_last ^= g_last;
if (g_last == 1) return;
g_animateFrame++;
g_animateFrame %= g_mapSettings.animateSpeed;
if (g_animateFrame > 0) return;
if (g_mapSettings.animate == false) return; if (g_mapSettings.animate == false) return;
@ -5435,7 +5438,7 @@ function handleStrike(strike)
let inRange = true; let inRange = true;
if (Math.abs(strike.o - g_myLon) > g_strikeRange) inRange = false; if (myRawGrid.length < 4 || Math.abs(strike.o - g_myLon) > g_strikeRange) inRange = false;
if (Math.abs(strike.a - g_myLat) > g_strikeRange) inRange = false; if (Math.abs(strike.a - g_myLat) > g_strikeRange) inRange = false;
@ -5888,13 +5891,13 @@ function toggleNexrad()
g_Nexrad = createNexRad(); g_Nexrad = createNexRad();
g_map.addLayer(g_Nexrad); g_map.addLayer(g_Nexrad);
if (g_nexradInterval == null) { g_nexradInterval = setInterval(nexradRefresh, 600000); } if (g_nexradInterval == null) { g_nexradInterval = nodeTimers.setInterval(nexradRefresh, 600000); }
} }
else else
{ {
if (g_nexradInterval != null) if (g_nexradInterval != null)
{ {
clearInterval(g_nexradInterval); nodeTimers.clearInterval(g_nexradInterval);
g_nexradInterval = null; g_nexradInterval = null;
} }
if (g_Nexrad) if (g_Nexrad)
@ -6294,7 +6297,7 @@ function handleWsjtxADIF(newMessage)
{ {
if (g_oldQSOTimer) if (g_oldQSOTimer)
{ {
clearTimeout(g_oldQSOTimer); nodeTimers.clearTimeout(g_oldQSOTimer);
g_oldQSOTimer = null; g_oldQSOTimer = null;
} }
@ -6305,13 +6308,13 @@ function handleWsjtxQSO(newMessage)
{ {
if (g_oldQSOTimer) if (g_oldQSOTimer)
{ {
clearTimeout(g_oldQSOTimer); nodeTimers.clearTimeout(g_oldQSOTimer);
g_oldQSOTimer = null; g_oldQSOTimer = null;
} }
g_oldStyleLogMessage = Object.assign({}, newMessage); g_oldStyleLogMessage = Object.assign({}, newMessage);
g_oldQSOTimer = setTimeout(oldSendToLogger, 3000); g_oldQSOTimer = nodeTimers.setTimeout(oldSendToLogger, 3000);
} }
function handleWsjtxNotSupported(newMessage) { } function handleWsjtxNotSupported(newMessage) { }
@ -6458,7 +6461,7 @@ function handleWsjtxStatus(newMessage)
bandChange = true; bandChange = true;
if (g_pskBandActivityTimerHandle != null) if (g_pskBandActivityTimerHandle != null)
{ {
clearInterval(g_pskBandActivityTimerHandle); nodeTimers.clearInterval(g_pskBandActivityTimerHandle);
g_pskBandActivityTimerHandle = null; g_pskBandActivityTimerHandle = null;
} }
removePaths(); removePaths();
@ -6469,7 +6472,7 @@ function handleWsjtxStatus(newMessage)
modeChange = true; modeChange = true;
if (g_pskBandActivityTimerHandle != null) if (g_pskBandActivityTimerHandle != null)
{ {
clearInterval(g_pskBandActivityTimerHandle); nodeTimers.clearInterval(g_pskBandActivityTimerHandle);
g_pskBandActivityTimerHandle = null; g_pskBandActivityTimerHandle = null;
} }
} }
@ -9374,7 +9377,7 @@ function showStatBox(resize)
return; return;
} }
if (g_statBoxTimer) clearTimeout(g_statBoxTimer); if (g_statBoxTimer) nodeTimers.clearTimeout(g_statBoxTimer);
if (count > 0) if (count > 0)
{ {
@ -9383,7 +9386,7 @@ function showStatBox(resize)
"&nbsp;<br/>...Parsing Log Entries...<br/>&nbsp;" "&nbsp;<br/>...Parsing Log Entries...<br/>&nbsp;"
); );
setStatsDivHeight("statViewDiv", "auto"); setStatsDivHeight("statViewDiv", "auto");
g_statBoxTimer = setTimeout(renderStatsBox, 250); g_statBoxTimer = nodeTimers.setTimeout(renderStatsBox, 250);
} }
else else
{ {
@ -11032,7 +11035,7 @@ function newMessageSetting(whichSetting)
} }
} }
function checkForNewVersion(showUptoDate) function checkForNewVersion(showUptoDate = false)
{ {
if (typeof nw != "undefined") if (typeof nw != "undefined")
{ {
@ -11058,7 +11061,7 @@ function downloadAcknowledgements()
80 80
); );
setTimeout(downloadAcknowledgements, 8640000); nodeTimers.setTimeout(downloadAcknowledgements, 8640000);
} }
} }
@ -11238,13 +11241,10 @@ function pskGetBandActivity()
if (g_pskBandActivityTimerHandle != null) if (g_pskBandActivityTimerHandle != null)
{ {
clearInterval(g_pskBandActivityTimerHandle); nodeTimers.clearInterval(g_pskBandActivityTimerHandle);
} }
g_pskBandActivityTimerHandle = setInterval(function () g_pskBandActivityTimerHandle = nodeTimers.setInterval(pskGetBandActivity, 601000); // every 20 minutes, 1 second
{
pskGetBandActivity();
}, 601000); // every 20 minutes, 1 second
} }
function getIniFromApp(appName) function getIniFromApp(appName)
@ -13041,9 +13041,9 @@ function changeLegendColor(source)
if (g_redrawFromLegendTimeoutHandle != null) if (g_redrawFromLegendTimeoutHandle != null)
{ {
clearTimeout(g_redrawFromLegendTimeoutHandle); nodeTimers.clearTimeout(g_redrawFromLegendTimeoutHandle);
} }
g_redrawFromLegendTimeoutHandle = setTimeout(redrawGrids, 500); g_redrawFromLegendTimeoutHandle = nodeTimers.setTimeout(redrawGrids, 500);
} }
function toggleLegend() function toggleLegend()
@ -13179,7 +13179,7 @@ function initSpeech()
{ {
window.speechSynthesis.onvoiceschanged = function () window.speechSynthesis.onvoiceschanged = function ()
{ {
setTimeout(timedGetVoices, 500); nodeTimers.setTimeout(timedGetVoices, 500);
}; };
var msg = new SpeechSynthesisUtterance("."); var msg = new SpeechSynthesisUtterance(".");
msg.lang = g_localeString; msg.lang = g_localeString;
@ -13504,11 +13504,8 @@ function startupVersionInit()
stopAskingCheckbox.checked = g_appSettings.stopAskingVersion; stopAskingCheckbox.checked = g_appSettings.stopAskingVersion;
if (stopAskingCheckbox.checked == false) if (stopAskingCheckbox.checked == false)
{ {
checkForNewVersion(false); checkForNewVersion();
setInterval(function () nodeTimers.setInterval(checkForNewVersion, 86400000);
{
checkForNewVersion(false);
}, 86400000);
} }
} }
@ -13564,7 +13561,7 @@ function startupEventsAndTimers()
{ {
document.addEventListener("keydown", onMyKeyDown, true); document.addEventListener("keydown", onMyKeyDown, true);
document.addEventListener("keyup", onMyKeyUp, false); document.addEventListener("keyup", onMyKeyUp, false);
displayTimeInterval = setInterval(displayTime, 1000); displayTimeInterval = nodeTimers.setInterval(displayTime, 1000);
} }
var g_finishedLoading = false; var g_finishedLoading = false;
@ -13604,6 +13601,7 @@ function postInit()
{ {
devPanel.style.display = "inline-block"; devPanel.style.display = "inline-block";
} }
nodeTimers.setInterval(removeFlightPathsAndDimSquares, 2000);
} }
document.addEventListener("dragover", function (event) document.addEventListener("dragover", function (event)
@ -13662,7 +13660,7 @@ function init()
documentsDiv.style.display = "none"; documentsDiv.style.display = "none";
startupDiv.style.display = "block"; startupDiv.style.display = "block";
startupStatusDiv.innerHTML = "Starting..."; startupStatusDiv.innerHTML = "Starting...";
setTimeout(startupEngine, 10); nodeTimers.setTimeout(startupEngine, 32);
} }
} }
@ -13673,7 +13671,7 @@ function startupEngine()
var funcInfo = g_startupTable.shift(); var funcInfo = g_startupTable.shift();
funcInfo[0](); funcInfo[0]();
startupStatusDiv.innerHTML = funcInfo[1]; startupStatusDiv.innerHTML = funcInfo[1];
setTimeout(startupEngine, 10); nodeTimers.setTimeout(startupEngine, 32);
} }
else else
{ {
@ -14336,10 +14334,10 @@ function lookupCallsign(callsign, gridPass, useCache = true)
} }
if (g_lookupTimeout != null) if (g_lookupTimeout != null)
{ {
window.clearTimeout(g_lookupTimeout); nodeTimers.clearTimeout(g_lookupTimeout);
g_lookupTimeout = null; g_lookupTimeout = null;
} }
g_lookupTimeout = setTimeout(searchLogForCallsign, 500, callsign); g_lookupTimeout = nodeTimers.setTimeout(searchLogForCallsign, 500, callsign);
if (useCache) if (useCache)
{ {
@ -16029,7 +16027,7 @@ function addNewOAMSSpot(cid, db)
{ {
if (g_oamsSpotTimeout !== null) if (g_oamsSpotTimeout !== null)
{ {
clearTimeout(g_oamsSpotTimeout); nodeTimers.clearTimeout(g_oamsSpotTimeout);
g_oamsSpotTimeout = null; g_oamsSpotTimeout = null;
} }
var report; var report;
@ -16062,7 +16060,7 @@ function addNewOAMSSpot(cid, db)
if (SNR < 0) SNR = 0; if (SNR < 0) SNR = 0;
report.color = SNR; report.color = SNR;
g_oamsSpotTimeout = setTimeout(redrawSpots, 500); g_oamsSpotTimeout = nodeTimers.setTimeout(redrawSpots, 500);
} }
} }
@ -16565,5 +16563,5 @@ function refreshSpotsNoTx()
redrawSpots(); redrawSpots();
} }
setInterval(refreshSpotsNoTx, 300000); nodeTimers.setInterval(refreshSpotsNoTx, 300000);
setTimeout(refreshSpotsNoTx, 300000); nodeTimers.setTimeout(refreshSpotsNoTx, 300000);

2
package.nw/lib/gtws.js
Wyświetl plik

@ -617,7 +617,7 @@ function gtLightningStrike(jsmesg)
function gtChatSystemInit() function gtChatSystemInit()
{ {
g_gtEngineInterval = setInterval(gtChatStateMachine, 1000); g_gtEngineInterval = nodeTimers.setInterval(gtChatStateMachine, 1000);
} }
function showGtFlags() function showGtFlags()

16
package.nw/lib/pota.js
Wyświetl plik

@ -268,13 +268,13 @@ function rbnReportResult(buffer, flag, cookies)
// It worked! process latest spots! // It worked! process latest spots!
if (g_pota.spotsTimeout) if (g_pota.spotsTimeout)
{ {
clearTimeout(g_pota.spotsTimeout); nodeTimers.clearTimeout(g_pota.spotsTimeout);
g_pota.spotsTimeout = null; g_pota.spotsTimeout = null;
} }
processPotaSpots(String(buffer)); processPotaSpots(String(buffer));
g_pota.spotsTimeout = setTimeout(getPotaSpots, 300000); g_pota.spotsTimeout = nodeTimers.setTimeout(getPotaSpots, 300000);
} }
function spotFromCallObj(callObj, park, inCount, rbnTime) function spotFromCallObj(callObj, park, inCount, rbnTime)
@ -357,7 +357,7 @@ function getPotaParks()
{ {
if (g_pota.parksTimeout) if (g_pota.parksTimeout)
{ {
clearTimeout(g_pota.parksTimeout); nodeTimers.clearTimeout(g_pota.parksTimeout);
g_pota.spotsTimeout = null; g_pota.spotsTimeout = null;
} }
@ -372,7 +372,7 @@ function getPotaParks()
); );
} }
g_pota.parksTimeout = setTimeout(getPotaParks, 86400000) g_pota.parksTimeout = nodeTimers.setTimeout(getPotaParks, 86400000)
} }
// This is a shallow copy, don't use with objects that contain other objects or arrays // This is a shallow copy, don't use with objects that contain other objects or arrays
@ -464,7 +464,7 @@ function getPotaSpots()
{ {
if (g_pota.spotsTimeout) if (g_pota.spotsTimeout)
{ {
clearTimeout(g_pota.spotsTimeout); nodeTimers.clearTimeout(g_pota.spotsTimeout);
g_pota.spotsTimeout = null; g_pota.spotsTimeout = null;
} }
@ -479,7 +479,7 @@ function getPotaSpots()
); );
} }
g_pota.spotsTimeout = setTimeout(getPotaSpots, 300000); g_pota.spotsTimeout = nodeTimers.setTimeout(getPotaSpots, 300000);
} }
function processPotaSchedule(buffer) function processPotaSchedule(buffer)
@ -538,7 +538,7 @@ function getPotaSchedule()
{ {
if (g_pota.scheduleTimeout) if (g_pota.scheduleTimeout)
{ {
clearTimeout(g_pota.scheduleTimeout); nodeTimers.clearTimeout(g_pota.scheduleTimeout);
g_pota.scheduleTimeout = null; g_pota.scheduleTimeout = null;
} }
@ -552,7 +552,7 @@ function getPotaSchedule()
443 443
); );
} }
g_pota.scheduleTimeout = setTimeout(getPotaSchedule, 900000); g_pota.scheduleTimeout = nodeTimers.setTimeout(getPotaSchedule, 900000);
} }
var g_lastPark = null; var g_lastPark = null;

4
package.nw/lib/roster.js
Wyświetl plik

@ -2,7 +2,7 @@
// All rights reserved. // All rights reserved.
// See LICENSE for more information. // See LICENSE for more information.
var fs = require("fs"); const fs = require("fs");
var callRoster = {}; var callRoster = {};
var g_blockedCalls = {}; var g_blockedCalls = {};
@ -2073,7 +2073,7 @@ function init()
initDXCCSelector(); initDXCCSelector();
g_timerInterval = setInterval(realtimeRoster, 1000); g_timerInterval = nodeTimers.setInterval(realtimeRoster, 1000);
updateInstances(); updateInstances();
} }

14
package.nw/lib/screens.js
Wyświetl plik

@ -1,3 +1,5 @@
const nodeTimers = require("timers");
var s_title = null; var s_title = null;
var s_screenSettings = {}; var s_screenSettings = {};
var s_zoomLevel = 0; var s_zoomLevel = 0;
@ -25,12 +27,12 @@ function clearAllScreenTimers()
{ {
if (g_windowMoveTimer != null) if (g_windowMoveTimer != null)
{ {
clearTimeout(g_windowMoveTimer); nodeTimers.clearTimeout(g_windowMoveTimer);
g_windowMoveTimer = null; g_windowMoveTimer = null;
} }
if (g_windowResizeTimer != null) if (g_windowResizeTimer != null)
{ {
clearTimeout(g_windowResizeTimer); nodeTimers.clearTimeout(g_windowResizeTimer);
g_windowResizeTimer = null; g_windowResizeTimer = null;
} }
} }
@ -125,9 +127,9 @@ nw.Window.get().on("move", function (x, y)
{ {
if (g_windowMoveTimer != null) if (g_windowMoveTimer != null)
{ {
clearTimeout(g_windowMoveTimer); nodeTimers.clearTimeout(g_windowMoveTimer);
} }
g_windowMoveTimer = setTimeout(setWindowInfo, 1000); g_windowMoveTimer = nodeTimers.setTimeout(setWindowInfo, 1000);
}); });
var g_windowResizeTimer = null; var g_windowResizeTimer = null;
@ -135,9 +137,9 @@ nw.Window.get().on("resize", function (w, h)
{ {
if (g_windowResizeTimer != null) if (g_windowResizeTimer != null)
{ {
clearTimeout(g_windowResizeTimer); nodeTimers.clearTimeout(g_windowResizeTimer);
} }
g_windowResizeTimer = setTimeout(setWindowInfo, 1000); g_windowResizeTimer = nodeTimers.setTimeout(setWindowInfo, 1000);
}); });
var g_zoomKeys = { var g_zoomKeys = {

2
package.nw/package.json
Wyświetl plik

@ -1,7 +1,7 @@
{ {
"name": "GridTracker", "name": "GridTracker",
"product_string_do_not_use": "gridtracker", "product_string_do_not_use": "gridtracker",
"version": "1.22.1001", "version": "1.22.1002",
"betaVersion": "", "betaVersion": "",
"description": "GridTracker, an amateur radio companion", "description": "GridTracker, an amateur radio companion",
"author": "GridTracker.org", "author": "GridTracker.org",