From b4c29ae7d590d094104243f85e8e95a1dc49049f Mon Sep 17 00:00:00 2001 From: Michael Prager Date: Wed, 27 Apr 2011 00:12:28 +0200 Subject: [PATCH] added NaN validation check for settings with numbers --- comingNext/index.html | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/comingNext/index.html b/comingNext/index.html index 7e774b9..0b8687c 100644 --- a/comingNext/index.html +++ b/comingNext/index.html @@ -933,13 +933,16 @@ function showSettings() config[key].Value = document.forms[0].elements["settings." + key].value; else if (config[key].Type == 'Int') { config[key].Value = parseInt(document.forms[0].elements["settings." + key].value); - if (config[key].Value < 0) + if (config[key].Value < 0 || isNaN(config[key].Value)) config[key].Value = config[key].Default; } else if (config[key].Type == 'Bool') config[key].Value = document.forms[0].elements["settings." + key].checked; - else if (config[key].Type == 'UID') + else if (config[key].Type == 'UID') { config[key].Value = parseInt(document.forms[0].elements["settings." + key].value); + if (isNaN(config[key].Value)) + config[key].Value = config[key].Default; + } else if (config[key].Type == 'Enum') { config[key].Value = document.forms[0].elements["settings." + key].value; if (config[key].ValidValues.indexOf(config[key].Value) == -1) @@ -1108,16 +1111,22 @@ function loadSettings() var key = pair[0]; var value = pair[1]; console.info('stringlist: ' + key + '=\'' + value + '\''); - if (config[key].Type == 'Int') + if (config[key].Type == 'Int') { config[key].Value = Number(value); + if (isNaN(config[key].Value)) + config[key].Value = config[key].Default; + } else if (config[key].Type == 'String') config[key].Value = value; else if (config[key].Type == 'Bool') config[key].Value = (value == 'true') else if (config[key].Type == 'Enum') config[key].Value = value; - else if (config[key].Type == 'UID') + else if (config[key].Type == 'UID') { config[key].Value = Number(value); + if (isNaN(config[key].Value)) + config[key].Value = config[key].Default; + } else if (config[key].Type == 'Array') { config[key].Value = value.split("^"); if (config[key].Value.length == 1 && config[key].Value[0] == "") { -- 2.39.2