CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-23 16:49:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Polyfill inadequate Intl support

Browse Source 
Ensure that formatting is balanced with parsing to avoid truncating numbers.
This commit is contained in:
Minh Nguyễn
2021-10-26 18:26:14 -07:00
parent 252828bb4b
commit 2ba7177080
5 changed files with 43 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ui/fields/input.js
+3 -2
View File
@@ -32,6 +32,7 @@ export function uiFieldText(field, context) {
var _tags;
var _phoneFormats = {};
const isDirectionField = field.key.split(':').some(keyPart => keyPart === 'direction');
const formatFloat = localizer.floatFormatter(localizer.languageCode());
const parseLocaleFloat = localizer.floatParser(localizer.languageCode());
if (field.type === 'tel') {
@@ -155,7 +156,7 @@ export function uiFieldText(field, context) {
}
// make sure no extra decimals are introduced
const numDecimals = v.includes('.') ? v.split('.')[1].length : 0;
return clamped(num).toFixed(numDecimals).toLocaleString(localizer.languageCode());
return formatFloat(clamped(num).toFixed(numDecimals));
});
input.node().value = vals.join(';');
change()();
@@ -434,7 +435,7 @@ export function uiFieldText(field, context) {
v = v.trim();
var num = parseFloat(v, 10);
if (!isFinite(num)) return v;
return clamped(num).toLocaleString(localizer.languageCode());
return formatFloat(clamped(num));
});
val = vals.join(';');
}
modules/ui/fields/roadheight.js
+5 -4
View File
@@ -16,6 +16,7 @@ export function uiFieldRoadheight(field, context) {
var _entityIDs = [];
var _tags;
var _isImperial;
var formatFloat = localizer.floatFormatter(localizer.languageCode());
var parseLocaleFloat = localizer.floatParser(localizer.languageCode());
var primaryUnits = [
@@ -164,18 +165,18 @@ export function uiFieldRoadheight(field, context) {
if (primaryValue && (primaryValue.indexOf('\'') >= 0 || primaryValue.indexOf('"') >= 0)) {
secondaryValue = primaryValue.match(/(-?[\d.]+)"/);
if (secondaryValue !== null) {
secondaryValue = parseFloat(secondaryValue[1], 10).toLocaleString(localizer.languageCode());
secondaryValue = formatFloat(parseFloat(secondaryValue[1], 10));
}
primaryValue = primaryValue.match(/(-?[\d.]+)'/);
if (primaryValue !== null) {
primaryValue = parseFloat(primaryValue[1], 10).toLocaleString(localizer.languageCode());
primaryValue = formatFloat(parseFloat(primaryValue[1], 10));
}
_isImperial = true;
} else if (primaryValue) {
var rawValue = primaryValue;
primaryValue = parseFloat(rawValue, 10);
if (isNaN(primaryValue)) primaryValue = rawValue;
primaryValue = primaryValue.toLocaleString(localizer.languageCode());
primaryValue = formatFloat(primaryValue);
_isImperial = false;
}
}
@@ -183,7 +184,7 @@ export function uiFieldRoadheight(field, context) {
setUnitSuggestions();
// If feet are specified but inches are omitted, assume zero inches.
var inchesPlaceholder = (0).toLocaleString(localizer.languageCode());
var inchesPlaceholder = formatFloat(0);
utilGetSetValue(primaryInput, typeof primaryValue === 'string' ? primaryValue : '')
.attr('title', isMixed ? primaryValue.filter(Boolean).join('\n') : null)
modules/ui/fields/roadspeed.js
+4 -3
View File
@@ -14,6 +14,7 @@ export function uiFieldRoadspeed(field, context) {
var _entityIDs = [];
var _tags;
var _isImperial;
var formatFloat = localizer.floatFormatter(localizer.languageCode());
var parseLocaleFloat = localizer.floatParser(localizer.languageCode());
var speedCombo = uiCombobox(context, 'roadspeed');
@@ -92,8 +93,8 @@ export function uiFieldRoadspeed(field, context) {
function comboValues(d) {
return {
value: d.toLocaleString(localizer.languageCode()),
title: d.toLocaleString(localizer.languageCode())
value: formatFloat(d),
title: formatFloat(d)
};
}
@@ -137,7 +138,7 @@ export function uiFieldRoadspeed(field, context) {
value = parseInt(value, 10);
if (isNaN(value)) value = rawValue;
value = value.toLocaleString(localizer.languageCode());
value = formatFloat(value);
}
setUnitSuggestions();