kopia lustrzana https://gitlab.com/gridtracker.org/gridtracker
Merge branch 'chrbayer.72-cr-broken' into 'master'
Revert "issue #48 Some Award Tracker hits don't produce alert script to be executed" See merge request gridtracker.org/gridtracker!78rich-presence v1.21.0324-rc2
commit
5d669d2210
|
@ -958,8 +958,6 @@ function viewRoster()
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var shouldAlert = false;
|
|
||||||
if (isAwardTracker)
|
if (isAwardTracker)
|
||||||
{
|
{
|
||||||
var tx = false;
|
var tx = false;
|
||||||
|
@ -975,7 +973,6 @@ function viewRoster()
|
||||||
if (tx)
|
if (tx)
|
||||||
{
|
{
|
||||||
var x = g_awardTracker[award];
|
var x = g_awardTracker[award];
|
||||||
shouldAlert = true;
|
|
||||||
callRoster[callHash].callObj.awardReason =
|
callRoster[callHash].callObj.awardReason =
|
||||||
g_awards[x.sponsor].awards[x.name].tooltip +
|
g_awards[x.sponsor].awards[x.name].tooltip +
|
||||||
" (" +
|
" (" +
|
||||||
|
@ -1056,6 +1053,7 @@ function viewRoster()
|
||||||
var wpx = "#FFFF00";
|
var wpx = "#FFFF00";
|
||||||
|
|
||||||
hasGtPin = false;
|
hasGtPin = false;
|
||||||
|
var shouldAlert = false;
|
||||||
var callsignBg,
|
var callsignBg,
|
||||||
gridBg,
|
gridBg,
|
||||||
callingBg,
|
callingBg,
|
||||||
|
|
Ładowanie…
Reference in New Issue