simon
/
domoboard
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow updates for the development environment

This commit is contained in:
wez3 2017-01-20 23:37:16 +01:00
parent d6cbc6a55b
commit 29ed7b22db
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
static/js/domoboard.js
View File

@ -406,12 +406,16 @@ function performUpgrade() {
$( "#updateView_not_available" ).addClass("show_update"); $( "#updateView_not_available" ).addClass("show_update");
} }
function checkVersion() { function checkVersion(branch) {
$.ajax({ $.ajax({
url: "https://domoboard.nl/version.md", url: "https://domoboard.nl/version.md",
cache: false, cache: false,
success: function( data ) { success: function( data ) {
dataFloat = parseFloat(data); if (branch == "master") {
dataFloat = parseFloat(data.split(","[0]));
} else {
dataFloat = parseFloat(data.split(","[1]));
}
versionFloat = parseFloat(version); versionFloat = parseFloat(version);
if (dataFloat > versionFloat) { if (dataFloat > versionFloat) {
document.getElementById('curver').innerHTML = version; document.getElementById('curver').innerHTML = version;
@ -424,13 +428,16 @@ function checkVersion() {
}); });
} }
function checkVersionSettings() { function checkVersionSettings(branch) {
$.ajax({ $.ajax({
url: "https://domoboard.nl/version.md", url: "https://domoboard.nl/version.md",
cache: false, cache: false,
success: function( data ) { success: function( data ) {
dataFloat = parseFloat(data); if (branch == "master") {
versionFloat = parseFloat(version); dataFloat = parseFloat(data.split(","[0]));
} else {
dataFloat = parseFloat(data.split(","[1]));
} versionFloat = parseFloat(version);
if (dataFloat > versionFloat) { if (dataFloat > versionFloat) {
$( "#updateView_available" ).removeClass("hide_update"); $( "#updateView_available" ).removeClass("hide_update");
$( "#updateView_available" ).addClass("show_update"); $( "#updateView_available" ).addClass("show_update");

2
templates/settings.html
View File

@ -170,7 +170,7 @@
document.getElementById("defaultOpen").click(); document.getElementById("defaultOpen").click();
setInterval(automaticIndex(), 9000); setInterval(automaticIndex(), 9000);
$('.fullSummary').hide(); $('.fullSummary').hide();
checkVersionSettings(); checkVersionSettings(branch);
}); });
retrieveAvailableDevices(); retrieveAvailableDevices();
selected_page_settings(); selected_page_settings();