Alerts now have more than 2 page support and properly wrap warnings
This commit is contained in:
BuildTools
parent
a1253a9e40
commit
b2b8c80637
|
|
@ -1252,7 +1252,7 @@ flex-direction: row;
|
||||||
.info-slide-content.health-forecast .frost-pane.mainforecast .title.heatwind {
|
.info-slide-content.health-forecast .frost-pane.mainforecast .title.heatwind {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
bottom: 30px;
|
bottom: 20px;
|
||||||
font-size: 37px;
|
font-size: 37px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
@ -1934,6 +1934,7 @@ flex-direction: row;
|
||||||
line-height: 125%;
|
line-height: 125%;
|
||||||
padding-right: 10px;
|
padding-right: 10px;
|
||||||
font-stretch: condensed;
|
font-stretch: condensed;
|
||||||
|
white-space: pre;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -167,63 +167,78 @@ RADAR < MAIN CITY < CITY 1 < CITY 2
|
||||||
}
|
}
|
||||||
return dateFns.format(new Date(expiretime), "h:mm A ") + displayday
|
return dateFns.format(new Date(expiretime), "h:mm A ") + displayday
|
||||||
}
|
}
|
||||||
if (i < 3) {
|
if (i != ret.length - 1) {
|
||||||
$('.bulletin .frost-pane .warnings').append(foreDataAlert.alerts[i].eventDescription + " in effect until " + getexpiredate(foreDataAlert.alerts[ret[i]].expireTimeLocal) + "</br></br>")
|
$('.bulletin .frost-pane .warnings').append(foreDataAlert.alerts[i].eventDescription + " in effect until " + getexpiredate(foreDataAlert.alerts[ret[i]].expireTimeLocal) + "\n \n")
|
||||||
} else {
|
} else {
|
||||||
page2.push(foreDataAlert.alerts[i].eventDescription + " in effect until " + getexpiredate(foreDataAlert.alerts[ret[i]].expireTimeLocal) + "</br></br>")
|
$('.bulletin .frost-pane .warnings').append(foreDataAlert.alerts[i].eventDescription + " in effect until " + getexpiredate(foreDataAlert.alerts[ret[i]].expireTimeLocal) + "\n \n")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
function splitLines() {
|
||||||
|
|
||||||
|
var warningsplitstr = $('.bulletin .frost-pane .warnings').text().split(/(?![^\n]{1,40}$)([^\n]{1,40})\s/g)
|
||||||
|
warningsplitstr.pop()
|
||||||
|
warningsplitstr.pop()
|
||||||
|
var warningpageidx = 0;
|
||||||
|
var warninglineidx = 0;
|
||||||
|
console.log(pages)
|
||||||
|
console.log(warningsplitstr)
|
||||||
|
warningsplitstr.forEach(warningline => {
|
||||||
|
if (warningline != "") {
|
||||||
|
if (warninglineidx == 0) {
|
||||||
|
pages[warningpageidx] = ""
|
||||||
|
}
|
||||||
|
console.log(warningline)
|
||||||
|
pages[warningpageidx] += (warningline + '<br>')
|
||||||
|
warninglineidx += 1;
|
||||||
|
if (warninglineidx == 7) {
|
||||||
|
warningpageidx += 1
|
||||||
|
warninglineidx = 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
//$('.bulletin .frost-pane .warnings').text($('.bulletin .frost-pane .warnings').text().replace(/(?![^\n]{1,40}$)([^\n]{1,40})\s/g, '$1\n'))
|
||||||
|
//console.log($('.bulletin .frost-pane .warnings').html())
|
||||||
|
makewarningPage(0)
|
||||||
}
|
}
|
||||||
|
splitLines()
|
||||||
|
|
||||||
$('.bulletin').fadeIn(0);
|
$('.bulletin').fadeIn(0);
|
||||||
$('.bulletin .frost-pane').fadeIn(500);
|
$('.bulletin .frost-pane').fadeIn(500);
|
||||||
$('#subhead-noaa').fadeIn(500);
|
$('#subhead-noaa').fadeIn(500);
|
||||||
setTimeout(function() {
|
function makewarningPage(warningpagenum) {
|
||||||
if (page2.length !== 0) {
|
if (warningpagenum > 0) {
|
||||||
$('.bulletin .frost-pane').fadeOut(500, function(){
|
$('.bulletin .frost-pane').fadeOut(500, function() {
|
||||||
$('.bulletin .frost-pane .warnings').empty()
|
$('.bulletin .frost-pane .warnings').html(pages[warningpagenum])
|
||||||
for (i=0; i<=foreDataAlert.alerts.length; i++){
|
$('.bulletin .frost-pane').fadeIn(500);
|
||||||
$('.bulletin .frost-pane .warnings').append(page2[i])
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
} else {
|
||||||
|
$('.bulletin .frost-pane .warnings').html(pages[warningpagenum])
|
||||||
$('.bulletin .frost-pane').fadeIn(500);
|
$('.bulletin .frost-pane').fadeIn(500);
|
||||||
setTimeout(function() {
|
}
|
||||||
|
setTimeout(function() {
|
||||||
|
if (warningpagenum < (pages.length - 1)) {
|
||||||
|
makewarningPage(warningpagenum + 1)
|
||||||
|
} else {
|
||||||
$('.bulletin').fadeIn(0);
|
$('.bulletin').fadeIn(0);
|
||||||
$('.bulletin .frost-pane').fadeOut(500);
|
$('.bulletin .frost-pane').fadeOut(500);
|
||||||
$('#subhead-noaa').fadeOut(500, function() {
|
$('#subhead-noaa').fadeOut(500, function() {
|
||||||
$('.bulletin').fadeOut(0);
|
$('.bulletin').fadeOut(0);
|
||||||
if (severemode == true) {
|
if (severemode == true) {
|
||||||
showRadarS(dataMan.locations[0].lat, dataMan.locations[0].long, 8, 60000)
|
showRadarS(dataMan.locations[0].lat, dataMan.locations[0].long, 8, 60000)
|
||||||
} else {
|
} else {
|
||||||
$('#minimap-cover').fadeOut(0)
|
$('#minimap-cover').fadeOut(0)
|
||||||
$('#info-slides-header .hscroller').empty();
|
$('#info-slides-header .hscroller').empty();
|
||||||
$('#marqueeSevere').fadeOut(0)
|
$('#marqueeSevere').fadeOut(0)
|
||||||
$('.marqueeheadersevere').fadeOut(0)
|
$('.marqueeheadersevere').fadeOut(0)
|
||||||
$('#arrow-img').fadeIn(0)
|
$('#arrow-img').fadeIn(0)
|
||||||
$('.radar-slide .infosubheader').css('background','linear-gradient(to top, #fffe21 0, #db5a14 100%);')
|
$('.radar-slide .infosubheader').css('background','linear-gradient(to top, #fffe21 0, #db5a14 100%);')
|
||||||
buildHeader();
|
buildHeader();
|
||||||
nextCity();
|
nextCity();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}, slideDelay);
|
|
||||||
} else {
|
|
||||||
$('.bulletin').fadeIn(0);
|
|
||||||
$('.bulletin .frost-pane').fadeOut(500);
|
|
||||||
$('#subhead-noaa').fadeOut(500, function() {
|
|
||||||
$('.bulletin').fadeOut(0);
|
|
||||||
if (severemode == true) {
|
|
||||||
showRadarS(dataMan.locations[0].lat, dataMan.locations[0].long, 8, 60000)
|
|
||||||
} else {
|
|
||||||
$('#minimap-cover').fadeOut(0)
|
|
||||||
$('#info-slides-header .hscroller').empty();
|
|
||||||
$('#marqueeSevere').fadeOut(0)
|
|
||||||
$('.marqueeheadersevere').fadeOut(0)
|
|
||||||
$('#arrow-img').fadeIn(0)
|
|
||||||
$('.radar-slide .infosubheader').css('background','linear-gradient(to top, #fffe21 0, #db5a14 100%);')
|
|
||||||
buildHeader();
|
|
||||||
nextCity();
|
|
||||||
}
|
}
|
||||||
});
|
}, slideDelay);
|
||||||
}
|
}
|
||||||
}, slideDelay);
|
|
||||||
} else {
|
} else {
|
||||||
if (severemode == true) {
|
if (severemode == true) {
|
||||||
showRadarS(dataMan.locations[0].lat, dataMan.locations[0].long, 8, 60000)
|
showRadarS(dataMan.locations[0].lat, dataMan.locations[0].long, 8, 60000)
|
||||||
|
|
@ -670,7 +685,7 @@ RADAR < MAIN CITY < CITY 1 < CITY 2
|
||||||
}
|
}
|
||||||
,showBulletin() {
|
,showBulletin() {
|
||||||
|
|
||||||
var page2 = [];
|
var pages = [""];
|
||||||
if (foreDataAlert !== undefined){
|
if (foreDataAlert !== undefined){
|
||||||
$('.bulletin .frost-pane .warnings').empty()
|
$('.bulletin .frost-pane .warnings').empty()
|
||||||
var displayday;
|
var displayday;
|
||||||
|
|
@ -691,44 +706,73 @@ RADAR < MAIN CITY < CITY 1 < CITY 2
|
||||||
}
|
}
|
||||||
return dateFns.format(new Date(expiretime), "h:mm A ") + displayday
|
return dateFns.format(new Date(expiretime), "h:mm A ") + displayday
|
||||||
}
|
}
|
||||||
if (i < 3) {
|
if (i != ret.length - 1) {
|
||||||
$('.bulletin .frost-pane .warnings').append(foreDataAlert.alerts[i].eventDescription + " in effect until " + getexpiredate(foreDataAlert.alerts[ret[i]].expireTimeLocal) + "</br></br>")
|
$('.bulletin .frost-pane .warnings').append(foreDataAlert.alerts[i].eventDescription + " in effect until " + getexpiredate(foreDataAlert.alerts[ret[i]].expireTimeLocal) + "\n \n")
|
||||||
} else {
|
} else {
|
||||||
page2.push(foreDataAlert.alerts[i].eventDescription + "in effect until " + getexpiredate(foreDataAlert.alerts[ret[i]].expireTimeLocal) + "</br></br>")
|
$('.bulletin .frost-pane .warnings').append(foreDataAlert.alerts[i].eventDescription + " in effect until " + getexpiredate(foreDataAlert.alerts[ret[i]].expireTimeLocal) + "\n \n")
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function splitLines() {
|
||||||
|
|
||||||
|
var warningsplitstr = $('.bulletin .frost-pane .warnings').text().split(/(?![^\n]{1,40}$)([^\n]{1,40})\s/g)
|
||||||
|
warningsplitstr.pop()
|
||||||
|
warningsplitstr.pop()
|
||||||
|
var warningpageidx = 0;
|
||||||
|
var warninglineidx = 0;
|
||||||
|
console.log(pages)
|
||||||
|
console.log(warningsplitstr)
|
||||||
|
warningsplitstr.forEach(warningline => {
|
||||||
|
if (warningline != "") {
|
||||||
|
if (warninglineidx == 0) {
|
||||||
|
pages[warningpageidx] = ""
|
||||||
|
}
|
||||||
|
console.log(warningline)
|
||||||
|
pages[warningpageidx] += (warningline + '<br>')
|
||||||
|
warninglineidx += 1;
|
||||||
|
if (warninglineidx == 7) {
|
||||||
|
warningpageidx += 1
|
||||||
|
warninglineidx = 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
//$('.bulletin .frost-pane .warnings').text($('.bulletin .frost-pane .warnings').text().replace(/(?![^\n]{1,40}$)([^\n]{1,40})\s/g, '$1\n'))
|
||||||
|
//console.log($('.bulletin .frost-pane .warnings').html())
|
||||||
|
makewarningPage(0)
|
||||||
}
|
}
|
||||||
|
splitLines()
|
||||||
$('.bulletin .frost-pane .cityname').text(location.city + " Area");
|
$('.bulletin .frost-pane .cityname').text(location.city + " Area");
|
||||||
//fade in
|
//fade in
|
||||||
$('.bulletin').fadeIn(0);
|
$('.bulletin').fadeIn(0);
|
||||||
$('.bulletin .frost-pane').fadeIn(500);
|
$('.bulletin .frost-pane').fadeIn(500);
|
||||||
|
|
||||||
$('#subhead-noaa').fadeIn(500);
|
$('#subhead-noaa').fadeIn(500);
|
||||||
setTimeout(function() {
|
function makewarningPage(warningpagenum) {
|
||||||
if (page2.length !== 0) {
|
if (warningpagenum > 0) {
|
||||||
$('.bulletin .frost-pane').fadeOut(500);
|
$('.bulletin .frost-pane').fadeOut(500, function() {
|
||||||
$('.bulletin .frost-pane .warnings').empty()
|
$('.bulletin .frost-pane .warnings').html(pages[warningpagenum])
|
||||||
for (i=0; i<=foreDataAlert.alerts.length; i++){
|
$('.bulletin .frost-pane').fadeIn(500);
|
||||||
$('.bulletin .frost-pane .warnings').append(page2[i])
|
});
|
||||||
}
|
} else {
|
||||||
|
$('.bulletin .frost-pane .warnings').html(pages[warningpagenum])
|
||||||
$('.bulletin .frost-pane').fadeIn(500);
|
$('.bulletin .frost-pane').fadeIn(500);
|
||||||
setTimeout(function() {
|
}
|
||||||
|
setTimeout(function() {
|
||||||
|
if (warningpagenum < (pages.length - 1)) {
|
||||||
|
makewarningPage(warningpagenum + 1)
|
||||||
|
} else {
|
||||||
$('.bulletin').fadeIn(0);
|
$('.bulletin').fadeIn(0);
|
||||||
$('.bulletin .frost-pane').fadeOut(500);
|
$('.bulletin .frost-pane').fadeOut(500);
|
||||||
$('#subhead-noaa').fadeOut(500, function() {
|
$('#subhead-noaa').fadeOut(500, function() {
|
||||||
$('.bulletin').fadeOut(0);
|
$('.bulletin').fadeOut(0);
|
||||||
wait(0)
|
wait(0)
|
||||||
});
|
});
|
||||||
}, slideDelay);
|
}
|
||||||
} else {
|
}, slideDelay);
|
||||||
$('.bulletin').fadeIn(0);
|
|
||||||
$('.bulletin .frost-pane').fadeOut(500);
|
|
||||||
$('#subhead-noaa').fadeOut(500, function() {
|
|
||||||
$('.bulletin').fadeOut(0);
|
|
||||||
wait(0)
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
}, slideDelay);
|
|
||||||
} else {wait(0)}
|
} else {wait(0)}
|
||||||
} else {wait(0)};
|
} else {wait(0)};
|
||||||
}
|
}
|
||||||
|
|
||||||
// Currently (10 sec)
|
// Currently (10 sec)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue