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 /js/src/builtin/TypedArray.js | |
| 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 'js/src/builtin/TypedArray.js')
| -rw-r--r-- | js/src/builtin/TypedArray.js | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/js/src/builtin/TypedArray.js b/js/src/builtin/TypedArray.js index a2205dc92..a1934051d 100644 --- a/js/src/builtin/TypedArray.js +++ b/js/src/builtin/TypedArray.js @@ -1232,11 +1232,7 @@ function TypedArrayToLocaleString(locales = undefined, options = undefined) { // Steps 6-7. // Omit the 'if' clause in step 6, since typed arrays can't have undefined // or null elements. -#if EXPOSE_INTL_API var R = ToString(callContentFunction(firstElement.toLocaleString, firstElement, locales, options)); -#else - var R = ToString(callContentFunction(firstElement.toLocaleString, firstElement)); -#endif // Step 3 (reordered). // We don't (yet?) implement locale-dependent separators. @@ -1258,11 +1254,7 @@ function TypedArrayToLocaleString(locales = undefined, options = undefined) { // the error message. So despite bug 1079853, we can skip step 9.c. // Step 9.d. -#if EXPOSE_INTL_API R = ToString(callContentFunction(nextElement.toLocaleString, nextElement, locales, options)); -#else - R = ToString(callContentFunction(nextElement.toLocaleString, nextElement)); -#endif // Step 9.e. R = S + R; |