diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-04 22:42:31 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-04 22:42:31 +0200 |
| commit | 3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d (patch) | |
| tree | 2ef4b78c728a2e1a323babc75205b19911a5ffc0 /layout/forms | |
| parent | 175efcbab02bbfea84e565cdea9ee96d6436a08f (diff) | |
| parent | 2860601772b392f3f6d2977269f11061f4e970ee (diff) | |
| download | UXP-3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d.tar UXP-3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d.tar.gz UXP-3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d.tar.lz UXP-3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d.tar.xz UXP-3b28e26d02106c31e3e2a03098ca24ea3f7e9f5d.zip | |
Merge branch 'intl-ICU-emoji-work'
Diffstat (limited to 'layout/forms')
| -rw-r--r-- | layout/forms/nsNumberControlFrame.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/layout/forms/nsNumberControlFrame.cpp b/layout/forms/nsNumberControlFrame.cpp index 58421ecb9..74dec2bea 100644 --- a/layout/forms/nsNumberControlFrame.cpp +++ b/layout/forms/nsNumberControlFrame.cpp @@ -680,14 +680,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), @@ -706,7 +704,6 @@ nsNumberControlFrame::GetValueOfAnonTextControl(nsAString& aValue) HTMLInputElement::FromContent(mTextField)->GetValue(aValue); -#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 @@ -747,7 +744,6 @@ nsNumberControlFrame::GetValueOfAnonTextControl(nsAString& aValue) // as 12.345, but HTMLInputElement::StringToDecimal would parse it to NaN. aValue.Truncate(); aValue.AppendFloat(value); -#endif } bool |