Fixededgecasewhereaseverewarninginanonmainlocationcanbreakthesim
This commit is contained in:
parent
897df5203a
commit
015e8d0b59
|
@ -30,7 +30,7 @@ function MarqueeMan() {
|
||||||
.marquee('destroy')
|
.marquee('destroy')
|
||||||
.marquee({speed: 170, delayBeforeStart: 1000, pauseOnHover: true, pauseOnCycle: true})
|
.marquee({speed: 170, delayBeforeStart: 1000, pauseOnHover: true, pauseOnCycle: true})
|
||||||
.on('finished', function(){
|
.on('finished', function(){
|
||||||
switchToWarningMarquee(((sidx < weatherInfo.bulletin.severewarnings.length) ? sdix + 1 : 0))
|
switchToWarningMarquee(((sidx < weatherInfo.bulletin.severewarnings.length) ? sidx + 1 : 0))
|
||||||
})
|
})
|
||||||
} else if (weatherInfo.bulletin.marqueewarnings.length != 0){
|
} else if (weatherInfo.bulletin.marqueewarnings.length != 0){
|
||||||
if (weatherInfo.bulletin.marqueewarnings[0].significance == "Y" ||weatherInfo.bulletin.marqueewarnings[0].significance == "S") {
|
if (weatherInfo.bulletin.marqueewarnings[0].significance == "Y" ||weatherInfo.bulletin.marqueewarnings[0].significance == "S") {
|
||||||
|
|
|
@ -523,7 +523,7 @@ function grabCitySlidesData() {
|
||||||
//get only weather alers
|
//get only weather alers
|
||||||
for (ai=0; ai<=ajaxedLoc["v3alertsHeadlines"].alerts.length - 1; ai++) {
|
for (ai=0; ai<=ajaxedLoc["v3alertsHeadlines"].alerts.length - 1; ai++) {
|
||||||
warning = ajaxedLoc["v3alertsHeadlines"].alerts[ai].categories[0].category;
|
warning = ajaxedLoc["v3alertsHeadlines"].alerts[ai].categories[0].category;
|
||||||
if ((warning == "Met" && weatherInfo.bulletin.includesevereonbulletin == true) || (warning == "Met" && ajaxedLoc["v3alertsHeadlines"].alerts[ai].eventDescription != "Severe Thunderstorm Warning" && ajaxedLoc["v3alertsHeadlines"].alerts[ai].eventDescription == "Flash Flood Warning" != ajaxedLoc["v3alertsHeadlines"].alerts[ai].eventDescription != "Tornado Warning")) {
|
if ((warning == "Met" && weatherInfo.bulletin.includesevereonbulletin == true) || (warning == "Met" && i != 0) || (warning == "Met" && ajaxedLoc["v3alertsHeadlines"].alerts[ai].eventDescription != "Severe Thunderstorm Warning" && ajaxedLoc["v3alertsHeadlines"].alerts[ai].eventDescription == "Flash Flood Warning" != ajaxedLoc["v3alertsHeadlines"].alerts[ai].eventDescription != "Tornado Warning")) {
|
||||||
ret.push({idx:ai, priority: getWarningPosition(ajaxedLoc["v3alertsHeadlines"].alerts[ai].eventDescription)})
|
ret.push({idx:ai, priority: getWarningPosition(ajaxedLoc["v3alertsHeadlines"].alerts[ai].eventDescription)})
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -760,7 +760,7 @@ function grabSideandLowerBarData() {
|
||||||
$.getJSON('https://api.weather.com/v3/alerts/detail?alertId='+ ajaxedLoc["v3alertsHeadlines"].alerts[sret[aai].idx].detailKey +'&format=json&language=en-US&apiKey=' + api_key, function(sdata) {
|
$.getJSON('https://api.weather.com/v3/alerts/detail?alertId='+ ajaxedLoc["v3alertsHeadlines"].alerts[sret[aai].idx].detailKey +'&format=json&language=en-US&apiKey=' + api_key, function(sdata) {
|
||||||
var severewarn = {warningname:"", warningdesc:"", warningstatus:""}
|
var severewarn = {warningname:"", warningdesc:"", warningstatus:""}
|
||||||
severewarn.warningname = ajaxedLoc["v3alertsHeadlines"].alerts[sret[aai].idx].eventDescription
|
severewarn.warningname = ajaxedLoc["v3alertsHeadlines"].alerts[sret[aai].idx].eventDescription
|
||||||
severewarn.warningstatus = ((ajaxedLoc["v3alertsHeadlines"].alerts[sret[aai].idx].messageType == " Update") ? 'UPDATE' : (ajaxedLoc["v3alertsHeadlines"].alerts[sret[aai].idx].messageType == "Cancel") ? " CANCELLATION" : "")
|
severewarn.warningstatus = ((ajaxedLoc["v3alertsHeadlines"].alerts[sret[aai].idx].messageType == "Update") ? 'UPDATE' : (ajaxedLoc["v3alertsHeadlines"].alerts[sret[aai].idx].messageType == "Cancel") ? "CANCELLATION" : "")
|
||||||
severewarn.warningdesc = sdata.alertDetail.texts[0].description
|
severewarn.warningdesc = sdata.alertDetail.texts[0].description
|
||||||
weatherInfo.bulletin.severewarnings.push(severewarn)
|
weatherInfo.bulletin.severewarnings.push(severewarn)
|
||||||
if (aai < (sret.length - 1)) {pushSevereAlert(aai + 1)};
|
if (aai < (sret.length - 1)) {pushSevereAlert(aai + 1)};
|
||||||
|
|
Loading…
Reference in New Issue