diff --git a/static/js/domoboard.js b/static/js/domoboard.js index 779a990..e40f72b 100644 --- a/static/js/domoboard.js +++ b/static/js/domoboard.js @@ -406,12 +406,16 @@ function performUpgrade() { $( "#updateView_not_available" ).addClass("show_update"); } -function checkVersion() { +function checkVersion(branch) { $.ajax({ url: "https://domoboard.nl/version.md", cache: false, success: function( data ) { - dataFloat = parseFloat(data); + if (branch == "master") { + dataFloat = parseFloat(data.split(","[0])); + } else { + dataFloat = parseFloat(data.split(","[1])); + } versionFloat = parseFloat(version); if (dataFloat > versionFloat) { document.getElementById('curver').innerHTML = version; @@ -424,13 +428,16 @@ function checkVersion() { }); } -function checkVersionSettings() { +function checkVersionSettings(branch) { $.ajax({ url: "https://domoboard.nl/version.md", cache: false, success: function( data ) { - dataFloat = parseFloat(data); - versionFloat = parseFloat(version); + if (branch == "master") { + dataFloat = parseFloat(data.split(","[0])); + } else { + dataFloat = parseFloat(data.split(","[1])); + } versionFloat = parseFloat(version); if (dataFloat > versionFloat) { $( "#updateView_available" ).removeClass("hide_update"); $( "#updateView_available" ).addClass("show_update"); diff --git a/templates/settings.html b/templates/settings.html index 99ccbba..c018fd5 100644 --- a/templates/settings.html +++ b/templates/settings.html @@ -170,7 +170,7 @@ document.getElementById("defaultOpen").click(); setInterval(automaticIndex(), 9000); $('.fullSummary').hide(); - checkVersionSettings(); + checkVersionSettings(branch); }); retrieveAvailableDevices(); selected_page_settings();