From: Michael Prager Date: Thu, 12 May 2011 15:05:35 +0000 (+0200) Subject: Revert "added NaN validation check for settings with numbers" X-Git-Url: https://code.delx.au/comingnext/commitdiff_plain/221517ab0531bd5f0e3557da95c7e8e7f10b0211 Revert "added NaN validation check for settings with numbers" This reverts commit b4c29ae7d590d094104243f85e8e95a1dc49049f. --- diff --git a/comingNext/index.html b/comingNext/index.html index 0b8687c..7e774b9 100644 --- a/comingNext/index.html +++ b/comingNext/index.html @@ -933,16 +933,13 @@ 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 || isNaN(config[key].Value)) + if (config[key].Value < 0) 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) @@ -1111,22 +1108,16 @@ 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] == "") {