Bug 1402861 - Remove ENABLE_INTL_API conditional from nsNumberControlFrame. r=dholbert

This commit is contained in:
Jonathan Kew
2017-09-26 13:28:21 +01:00
parent c9613d74d3
commit 6890518c75

View File

@@ -657,14 +657,12 @@ nsNumberControlFrame::SetValueOfAnonTextControl(const nsAString& aValue)
// state will be set to invalid) or if aValue can't be localized:
nsAutoString localizedValue(aValue);
#ifdef ENABLE_INTL_API
// Try and localize the value we will set:
Decimal val = HTMLInputElement::StringToDecimal(aValue);
if (val.isFinite()) {
ICUUtils::LanguageTagIterForContent langTagIter(mContent);
ICUUtils::LocalizeNumber(val.toDouble(), langTagIter, localizedValue);
}
#endif
// We need to update the value of our anonymous text control here. Note that
// this must be its value, and not its 'value' attribute (the default value),
@@ -690,7 +688,6 @@ nsNumberControlFrame::GetValueOfAnonTextControl(nsAString& aValue)
HTMLInputElement::FromContent(mTextField)->GetValue(aValue, CallerType::System);
#ifdef ENABLE_INTL_API
// Here we need to de-localize any number typed in by the user. That is, we
// need to convert it from the number format of the user's language, region,
// etc. to the format that the HTML 5 spec defines to be a "valid
@@ -731,7 +728,6 @@ nsNumberControlFrame::GetValueOfAnonTextControl(nsAString& aValue)
// as 12.345, but HTMLInputElement::StringToDecimal would parse it to NaN.
aValue.Truncate();
aValue.AppendFloat(value);
#endif
}
bool