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

refactor so far

merge-requests/150/merge
Matthew Chambers 2021-06-28 19:19:26 -05:00
rodzic 1f45299286
commit 443409b902
3 zmienionych plików z 65 dodań i 110 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
package.nw/gt_roster.html
Wyświetl plik

@ -22,6 +22,13 @@
<script src="./lib/protos.js" type="text/javascript"></script>
<script src="./lib/third-party.js" type="text/javascript"></script>
<script src="./lib/roster.js" type="text/javascript"></script>
<script src="./lib/roster/prepareRosterSettings.js" type="text/javascript"></script>
<script src="./lib/roster/processRosterFiltering.js" type="text/javascript"></script>
<script src="./lib/roster/processRosterHunting.js" type="text/javascript"></script>
<script src="./lib/roster/renderCompactRoster.js" type="text/javascript"></script>
<script src="./lib/roster/renderNormalRoster.js" type="text/javascript"></script>
<script src="./lib/roster/renderRoster.js" type="text/javascript"></script>
<script src="./lib/roster/sendAlerts.js" type="text/javascript"></script>
<script src="./lib/screens.js"></script>
</head>
<body onload="init()" class="roster" oncontextmenu="return handleContextMenu(event);">

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

@ -369,58 +369,6 @@ function myGTCompare(a, b)
return 0;
}
var r_sortFunction = [
myCallCompare,
myGridCompare,
myDbCompare,
myDTCompare,
myFreqCompare,
myDxccCompare,
myTimeCompare,
myDistanceCompare,
myHeadingCompare,
myStateCompare,
myCQCompare,
myWPXCompare,
myLifeCompare,
mySpotCompare,
myGTCompare,
myCntyCompare,
myContCompare
];
var r_excptTest = [
timeChk,
crEnable,
blockedCall,
blockedFrom,
blcokedDXCC,
cqOnly,
useRegex,
reqGrid,
minDB,
maxDT,
minFreq,
maxFreq,
noMsg,
onlyMesg,
myDXCC,
lotwUse,
eqslUse,
oqrsUse,
noMyCQDX,
callWorked,
callConfirmed,
huntGrid,
huntDXCC,
huntDXCCs,
huntWPX,
huntCQ,
huntITU,
huntUSStates,
huntUSState
];
function showRosterBox(sortIndex)
{
if (g_rosterSettings.lastSortIndex != sortIndex)

116
package.nw/lib/roster/sendAlerts.js
Wyświetl plik

@ -52,84 +52,84 @@ function sendAlerts(callRoster, rosterSettings)
}
callObj.shouldAlert = false;
}
// NOTE: Ring alerts if needed
try
{
if (fs.existsSync(dirPath))
// NOTE: Ring alerts if needed
try
{
if (window.opener.g_platform == "windows")
if (fs.existsSync(dirPath))
{
script = "cr-alert.bat";
}
if (
fs.existsSync(dirPath + script) &&
if (window.opener.g_platform == "windows")
{
script = "cr-alert.bat";
}
if (
fs.existsSync(dirPath + script) &&
g_rosterSettings.realtime == false
)
{
scriptExists = true;
scriptIcon.innerHTML =
)
{
scriptExists = true;
scriptIcon.innerHTML =
"<div class='buttonScript' onclick='window.opener.toggleCRScript();'>" +
(window.opener.g_crScript == 1
? "<font color='lightgreen'>Script Enabled</font>"
: "<font color='yellow'>Script Disabled</font>") +
"</div>";
scriptIcon.style.display = "block";
}
else
{
scriptIcon.style.display = "none";
scriptIcon.style.display = "block";
}
else
{
scriptIcon.style.display = "none";
}
}
}
}
catch (e) {}
catch (e) {}
if (shouldAlert > 0)
{
if (window.opener.g_classicAlerts.huntRoster == true)
if (shouldAlert > 0)
{
var notify = window.opener.huntRosterNotify.value;
if (notify == "0")
if (window.opener.g_classicAlerts.huntRoster == true)
{
var media = window.opener.huntRosterNotifyMedia.value;
if (media != "none") window.opener.playAlertMediaFile(media);
var notify = window.opener.huntRosterNotify.value;
if (notify == "0")
{
var media = window.opener.huntRosterNotifyMedia.value;
if (media != "none") window.opener.playAlertMediaFile(media);
}
else if (notify == "1")
{
window.opener.speakAlertString(
window.opener.huntRosterNotifyWord.value
);
}
}
else if (notify == "1")
{
window.opener.speakAlertString(
window.opener.huntRosterNotifyWord.value
);
}
}
if (
g_rosterSettings.realtime == false &&
if (
g_rosterSettings.realtime == false &&
scriptExists &&
window.opener.g_crScript == 1
)
{
try
)
{
fs.writeFileSync(
dirPath + "cr-alert.json",
JSON.stringify(g_scriptReport, null, 2)
);
try
{
fs.writeFileSync(
dirPath + "cr-alert.json",
JSON.stringify(g_scriptReport, null, 2)
);
var thisProc = dirPath + script;
var cp = require("child_process");
var child = cp.spawn(thisProc, [], {
detached: true,
cwd: dirPath.slice(0, -1),
stdio: ["ignore", "ignore", "ignore"]
});
child.unref();
var thisProc = dirPath + script;
var cp = require("child_process");
var child = cp.spawn(thisProc, [], {
detached: true,
cwd: dirPath.slice(0, -1),
stdio: ["ignore", "ignore", "ignore"]
});
child.unref();
}
catch (e)
{
conosle.log(e);
}
g_scriptReport = Object();
}
catch (e)
{
conosle.log(e);
}
g_scriptReport = Object();
else g_scriptReport = Object();
}
else g_scriptReport = Object();
}