* camera images ordered by mtime

* display image by camera is now second to last, not the last one
* indent changes in javascript code
* js code should now be more roboust if there are camera folders getting deleted
This commit is contained in:
Dávid Danyi
2018-01-25 15:44:39 +01:00
parent 07a95f5c4b
commit 139116d76f
8 changed files with 46 additions and 34 deletions

View File

@@ -1,37 +1,37 @@
jQuery(document).ready(function () {
var cameraImages = [];
var cameraPointer = 0;
var cameraImages = [];
var cameraPointer = 0;
function changeImage(pointer) {
$('#cameraImage').css(
'background-image',
'url(' + cameraImageBaseUrl + cameraImages[pointer].camera + '/' + cameraImages[pointer].imageName + ')'
);
$('#cameraText').text(cameraImages[pointer].text);
}
function changeImage(pointer) {
$('#cameraImage').css(
'background-image',
'url(' + cameraImageBaseUrl + cameraImages[pointer].camera + '/' + cameraImages[pointer].imageName + ')'
);
$('#cameraText').text(cameraImages[pointer].text);
}
function refreshCameraImages() {
function refreshCameraImages() {
jQuery.get(cameraImageApiUrl, function (data) {
cameraImages = data;
}).always(function () {
window.setTimeout(refreshCameraImages, refreshInterval);
});
}
// initial image load
jQuery.get(cameraImageApiUrl, function (data) {
cameraImages = data;
}).always(function() {
window.setTimeout(refreshCameraImages, refreshInterval);
cameraImages = data;
changeImage(0);
window.setTimeout(refreshCameraImages, refreshInterval);
// change displayed image
window.setInterval(function () {
cameraPointer = cameraPointer >= cameraImages.length - 1
? 0
: cameraPointer + 1;
changeImage(cameraPointer);
}, changeDelay);
});
}
// initial image load
jQuery.get(cameraImageApiUrl, function (data) {
cameraImages = data;
changeImage(0);
window.setTimeout(refreshCameraImages, refreshInterval);
// change displayed image
window.setInterval(function () {
cameraPointer = cameraPointer === cameraImages.length - 1
? 0
: cameraPointer + 1;
changeImage(cameraPointer);
}, changeDelay);
});
});