From 74fdf174779aa5cc4b98ec81274072c5d443b09c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Fri, 12 Nov 2021 23:05:19 -0800 Subject: [PATCH] More minor corrections from code review --- modules/core/localizer.js | 1 + modules/ui/fields/input.js | 6 +++--- modules/ui/fields/roadheight.js | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/core/localizer.js b/modules/core/localizer.js index 9c9e656b3..2e100a4eb 100644 --- a/modules/core/localizer.js +++ b/modules/core/localizer.js @@ -432,6 +432,7 @@ export function coreLocalizer() { return (number) => number.toLocaleString(locale); } }; + localizer.floatParser = (locale) => { // https://stackoverflow.com/a/55366435/4585461 const polyfill = (string) => parseFloat(string.trim()); diff --git a/modules/ui/fields/input.js b/modules/ui/fields/input.js index 086809ff2..45e48d9de 100644 --- a/modules/ui/fields/input.js +++ b/modules/ui/fields/input.js @@ -137,7 +137,7 @@ export function uiFieldText(field, context) { v = v.trim(); var num = parseLocaleFloat(v); if (isDirectionField) { - const compassDir = cardinal[v.trim().toLowerCase()]; + const compassDir = cardinal[v.toLowerCase()]; if (compassDir !== undefined) { num = compassDir; } @@ -145,7 +145,7 @@ export function uiFieldText(field, context) { // do nothing if the value is neither a number, nor a cardinal direction if (!isFinite(num)) return v; - num = parseFloat(num, 10); + num = parseFloat(num); if (!isFinite(num)) return v; num += d; @@ -401,7 +401,7 @@ export function uiFieldText(field, context) { var vals = val.split(';'); vals = vals.map(function(v) { var num = parseLocaleFloat(v); - return isFinite(num)) ? clamped(num) : v; + return isFinite(num) ? clamped(num) : v; }); val = vals.join(';'); } diff --git a/modules/ui/fields/roadheight.js b/modules/ui/fields/roadheight.js index 37863be60..696d8c119 100644 --- a/modules/ui/fields/roadheight.js +++ b/modules/ui/fields/roadheight.js @@ -165,16 +165,16 @@ export function uiFieldRoadheight(field, context) { if (primaryValue && (primaryValue.indexOf('\'') >= 0 || primaryValue.indexOf('"') >= 0)) { secondaryValue = primaryValue.match(/(-?[\d.]+)"/); if (secondaryValue !== null) { - secondaryValue = formatFloat(parseFloat(secondaryValue[1], 10)); + secondaryValue = formatFloat(parseFloat(secondaryValue[1])); } primaryValue = primaryValue.match(/(-?[\d.]+)'/); if (primaryValue !== null) { - primaryValue = formatFloat(parseFloat(primaryValue[1], 10)); + primaryValue = formatFloat(parseFloat(primaryValue[1])); } _isImperial = true; } else if (primaryValue) { var rawValue = primaryValue; - primaryValue = parseFloat(rawValue, 10); + primaryValue = parseFloat(rawValue); if (isNaN(primaryValue)) primaryValue = rawValue; primaryValue = formatFloat(primaryValue); _isImperial = false;