Fixseverewarnings
This commit is contained in:
parent
dfca557caa
commit
897df5203a
|
@ -171,7 +171,7 @@ function WeatherAudio() {
|
||||||
startPlaying(['/localvocals/narrations/Your_current_conditions.mp3'], false);
|
startPlaying(['/localvocals/narrations/Your_current_conditions.mp3'], false);
|
||||||
}
|
}
|
||||||
this.playwarningbeep = function () {
|
this.playwarningbeep = function () {
|
||||||
startPlaying(['/localvocals/narrations/warningbeep.mp3'], false);
|
startPlaying(['/localvocals/narrations/warningbeep.wav'], false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -17,21 +17,21 @@ function MarqueeMan() {
|
||||||
if (weatherInfo.bulletin.severewarnings.length != 0) {
|
if (weatherInfo.bulletin.severewarnings.length != 0) {
|
||||||
$('#marqueeSevere').css("background","linear-gradient(to right, #510d08 0, #b41a08 100%)")
|
$('#marqueeSevere').css("background","linear-gradient(to right, #510d08 0, #b41a08 100%)")
|
||||||
$('.marqueeheadersevere').css("background","linear-gradient(to right, #d51e08 0, #b41a08 100%)")
|
$('.marqueeheadersevere').css("background","linear-gradient(to right, #d51e08 0, #b41a08 100%)")
|
||||||
$('.marqueeheadersevere').css("color","#fff")
|
$('.marqueeheadersevere').css("color","#DDDDDD")
|
||||||
$('.marqueeheadersevere').css("text-shadow","2px 2px 4px #000")
|
$('.marqueeheadersevere').css("text-shadow","2px 2px 4px #000")
|
||||||
|
|
||||||
$('.marqueeheadersevere').text((weatherInfo.bulletin.severewarnings[sidx].name).toUpperCase() + ' ' + weatherInfo.bulletin.severewarnings[sidx].status);
|
$('.marqueeheadersevere').text((weatherInfo.bulletin.severewarnings[sidx].warningname).toUpperCase() + ' ' + weatherInfo.bulletin.severewarnings[sidx].warningstatus);
|
||||||
$('#arrow-img').fadeOut(0)
|
$('#arrow-img').fadeOut(0)
|
||||||
$('#marqueeSevere').fadeIn(0)
|
$('#marqueeSevere').fadeIn(0)
|
||||||
$('.marqueeheadersevere').fadeIn(0) //#868686
|
$('.marqueeheadersevere').fadeIn(0) //#868686
|
||||||
$('#marqueeSevere').text(weatherInfo.bulletin.severewarnings[sidx].desc)
|
$('#marqueeSevere').text(weatherInfo.bulletin.severewarnings[sidx].warningdesc)
|
||||||
|
weatherAudio.playwarningbeep()
|
||||||
$('#marqueeSevere')
|
$('#marqueeSevere')
|
||||||
.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(){
|
||||||
switchSevereMarquee((sidx < weatherInfo.bulletin.severewarnings.length) ? sdix + 1 : 0)
|
switchToWarningMarquee(((sidx < weatherInfo.bulletin.severewarnings.length) ? sdix + 1 : 0))
|
||||||
});
|
})
|
||||||
weatherAudio.playwarningbeep()
|
|
||||||
} 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") {
|
||||||
$('#marqueeSevere').css('background','linear-gradient(to right, #874901 0, #bb631a 100%)')
|
$('#marqueeSevere').css('background','linear-gradient(to right, #874901 0, #bb631a 100%)')
|
||||||
|
@ -46,7 +46,7 @@ function MarqueeMan() {
|
||||||
} else if (weatherInfo.bulletin.marqueewarnings[0].significance == "W") {
|
} else if (weatherInfo.bulletin.marqueewarnings[0].significance == "W") {
|
||||||
$('#marqueeSevere').css("background","linear-gradient(to right, #510d08 0, #b41a08 100%)")
|
$('#marqueeSevere').css("background","linear-gradient(to right, #510d08 0, #b41a08 100%)")
|
||||||
$('.marqueeheadersevere').css("background","linear-gradient(to right, #d51e08 0, #b41a08 100%)")
|
$('.marqueeheadersevere').css("background","linear-gradient(to right, #d51e08 0, #b41a08 100%)")
|
||||||
$('.marqueeheadersevere').css("color","#fff")
|
$('.marqueeheadersevere').css("color","#DDDDDD")
|
||||||
$('.marqueeheadersevere').css("text-shadow","2px 2px 4px #000")
|
$('.marqueeheadersevere').css("text-shadow","2px 2px 4px #000")
|
||||||
}
|
}
|
||||||
$('.marqueeheadersevere').text((weatherInfo.bulletin.marqueewarnings[0].name).toUpperCase() + ' ' + weatherInfo.bulletin.marqueewarnings[0].status)
|
$('.marqueeheadersevere').text((weatherInfo.bulletin.marqueewarnings[0].name).toUpperCase() + ' ' + weatherInfo.bulletin.marqueewarnings[0].status)
|
||||||
|
@ -156,7 +156,7 @@ function MarqueeMan() {
|
||||||
}
|
}
|
||||||
//init and loop the things
|
//init and loop the things
|
||||||
refreshMarquee(0);
|
refreshMarquee(0);
|
||||||
switchToWarningMarquee();
|
switchToWarningMarquee(0);
|
||||||
displayCCTickerData();
|
displayCCTickerData();
|
||||||
setInterval(function(){
|
setInterval(function(){
|
||||||
displayCCTickerData();
|
displayCCTickerData();
|
||||||
|
|
|
@ -744,10 +744,10 @@ function grabSideandLowerBarData() {
|
||||||
var alertt = {name:"", desc:"", status:"", significance:""}
|
var alertt = {name:"", desc:"", status:"", significance:""}
|
||||||
alertt.name = ajaxedLoc["v3alertsHeadlines"].alerts[ret[aai].idx].eventDescription
|
alertt.name = ajaxedLoc["v3alertsHeadlines"].alerts[ret[aai].idx].eventDescription
|
||||||
alertt.significance = ajaxedLoc["v3alertsHeadlines"].alerts[ret[aai].idx].significance
|
alertt.significance = ajaxedLoc["v3alertsHeadlines"].alerts[ret[aai].idx].significance
|
||||||
alertt.status = ((ajaxedLoc["v3alertsHeadlines"].alerts[ret[aai].idx].messageType == " Update") ? 'UPDATE' : (ajaxedLoc["v3alertsHeadlines"].alerts[ret[aai].idx].messageType == "Cancel") ? " CANCELLATION" : "")
|
alertt.status = ((ajaxedLoc["v3alertsHeadlines"].alerts[ret[aai].idx].messageType == " Update") ? 'UPDATE' : (ajaxedLoc["v3alertsHeadlines"].alerts[ret[aai].idx].messageType == "Cancel") ? "CANCELLATION" : "")
|
||||||
alertt.desc = adata.alertDetail.texts[0].description
|
alertt.desc = adata.alertDetail.texts[0].description
|
||||||
weatherInfo.bulletin.marqueewarnings.push(alertt)
|
weatherInfo.bulletin.marqueewarnings.push(alertt)
|
||||||
if (aai < (ret.length - 1)) {pushAlert(aai = aai + 1)};
|
if (aai < (ret.length - 1)) {pushAlert(aai + 1)};
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
pushAlert(0)
|
pushAlert(0)
|
||||||
|
@ -757,13 +757,13 @@ function grabSideandLowerBarData() {
|
||||||
weatherInfo.bulletin.severeweathermode = true;
|
weatherInfo.bulletin.severeweathermode = true;
|
||||||
sret.sort(function(a,b) {return a.priority - b.priority;});
|
sret.sort(function(a,b) {return a.priority - b.priority;});
|
||||||
function pushSevereAlert(aai) {
|
function pushSevereAlert(aai) {
|
||||||
$.getJSON('https://api.weather.com/v3/alerts/detail?alertId='+ ajaxedLoc["v3alertsHeadlines"].alerts[sret[i]].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[aii].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)) {pushAlert(aai = aai + 1)};
|
if (aai < (sret.length - 1)) {pushSevereAlert(aai + 1)};
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
pushSevereAlert(0)
|
pushSevereAlert(0)
|
||||||
|
|
Loading…
Reference in New Issue