diff --git a/assets/webconfig/content/support.html b/assets/webconfig/content/support.html index 00810b1c..310b499c 100644 --- a/assets/webconfig/content/support.html +++ b/assets/webconfig/content/support.html @@ -127,4 +127,5 @@ diff --git a/assets/webconfig/content/update.html b/assets/webconfig/content/update.html index 9ed48fc9..80e9cd46 100644 --- a/assets/webconfig/content/update.html +++ b/assets/webconfig/content/update.html @@ -16,25 +16,29 @@ diff --git a/assets/webconfig/js/content_dashboard.js b/assets/webconfig/js/content_dashboard.js index c94eef9b..19813502 100644 --- a/assets/webconfig/js/content_dashboard.js +++ b/assets/webconfig/js/content_dashboard.js @@ -80,43 +80,21 @@ $(document).ready( function() { $('#dash_ports').html(window.serverConfig.flatbufServer.port+' | '+window.serverConfig.protoServer.port); $('#dash_versionbranch').html(window.serverConfig.general.versionBranch); - $.get( window.gitHubReleaseApiUrl, function( releases ) { - window.gitHubVersionList = releases; + getReleases(function(){ + var cleanLatestVersion = window.latestVersion.tag_name.replace(/\./g, ''); + var cleanCurrentVersion = window.currentVersion.replace(/\./g, ''); - for(var i in releases) - { - if(releases[i].prerelease == true) - { - window.latestBetaVersion = releases[i]; - break; - } - } + $('#dash_latev').html(window.currentVersion); + $('#dash_latev').html(window.latestVersion.tag_name + ' (' + (window.latestVersion.prerelease == true ? "Beta" : "Stable") + ')'); - $.get( window.gitHubReleaseApiUrl + "/latest", function( latest ) { - window.latestStableVersion = latest; - - if(window.serverConfig.general.versionBranch == "Beta" && window.latestStableVersion.tag_name.replace(/\./g, '') <= window.latestBetaVersion.tag_name.replace(/\./g, '')) - { - window.latestVersion = window.latestBetaVersion; - } - else - { - window.latestVersion = window.latestStableVersion; - } - - var cleanLatestVersion = window.latestVersion.tag_name.replace(/\./g, ''); - var cleanCurrentVersion = window.currentVersion.replace(/\./g, ''); - - $('#dash_latev').html(window.currentVersion); - $('#dash_latev').html(window.latestVersion.tag_name + ' (' + (window.latestVersion.prerelease == true ? "Beta" : "Stable") + ')'); - - if ( cleanCurrentVersion < cleanLatestVersion ) - $('#versioninforesult').html('