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ęć

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);">

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)

Wyświetl plik

@ -52,11 +52,10 @@ function sendAlerts(callRoster, rosterSettings)
}
callObj.shouldAlert = false;
}
// NOTE: Ring alerts if needed
try
{
// NOTE: Ring alerts if needed
try
{
if (fs.existsSync(dirPath))
{
if (window.opener.g_platform == "windows")
@ -82,11 +81,11 @@ try
scriptIcon.style.display = "none";
}
}
}
catch (e) {}
}
catch (e) {}
if (shouldAlert > 0)
{
if (shouldAlert > 0)
{
if (window.opener.g_classicAlerts.huntRoster == true)
{
var notify = window.opener.huntRosterNotify.value;
@ -132,4 +131,5 @@ if (shouldAlert > 0)
g_scriptReport = Object();
}
else g_scriptReport = Object();
}
}