From bb3d343c390a1a7d3c33b452cf4f1712ed1bf68d Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 8 Dec 2016 10:52:20 +0100 Subject: [PATCH 1/2] Fix versionCompare(left, right) --- js/pihole/footer.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/js/pihole/footer.js b/js/pihole/footer.js index b8a7dc24..7e2b0401 100644 --- a/js/pihole/footer.js +++ b/js/pihole/footer.js @@ -42,12 +42,16 @@ var piholeVersion = $("#piholeVersion").html(); var webVersion = $("#webVersion").html(); // Credit for following function: https://gist.github.com/alexey-bass/1115557 +// Modified to discard any possible "v" in the string function versionCompare(left, right) { if (typeof left + typeof right != 'stringstring') return false; - var a = left.split('.') - , b = right.split('.') + var aa = left.split("v"), + bb = right.split("v"); + + var a = aa[aa.length-1].split(".") + , b = bb[bb.length-1].split(".") , i = 0, len = Math.max(a.length, b.length); for (; i < len; i++) { @@ -58,8 +62,7 @@ function versionCompare(left, right) { } } - return 0; -} + // Update check $.getJSON("https://api.github.com/repos/pi-hole/pi-hole/releases/latest", function(json) { From 9812e46e00ab36308acca168c83d0754d8475910 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 8 Dec 2016 22:44:13 +0100 Subject: [PATCH 2/2] Added a brace that disappeared earlier. --- js/pihole/footer.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/pihole/footer.js b/js/pihole/footer.js index 7e2b0401..974dcc50 100644 --- a/js/pihole/footer.js +++ b/js/pihole/footer.js @@ -61,7 +61,8 @@ function versionCompare(left, right) { return -1; } } - + return 0; +} // Update check