fix conversion typed array constructors to string, fix #300

zloirock · Jul 26, 2017 · 198fb53 · 198fb53
1 parent 58f9b11
commit 198fb53
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -60,6 +60,7 @@
 - Fixed `%TypedArray%.from` Safari bug, [#285](https://github.com/zloirock/core-js/issues/285)
 - Fixed compatibility with old version of Prototype.js, [#278](https://github.com/zloirock/core-js/issues/278), [#289](https://github.com/zloirock/core-js/issues/289)
 - Added errors on incorrect context of collection methods, [#272](https://github.com/zloirock/core-js/issues/272)
+- Fixed conversion typed array constructors to string, fix [#300](https://github.com/zloirock/core-js/issues/300)
 - Fixed `Set#size` with debugger ReactNative for Android, [#297](https://github.com/zloirock/core-js/issues/297)
 - Fixed an issue with Electron-based debugger, [#230](https://github.com/zloirock/core-js/issues/230)
 - Fixed compatibility with incomplete third-party `WeakMap` polyfills, [#252](https://github.com/zloirock/core-js/pull/252)

diff --git a/client/core.js b/client/core.js
@@ -1097,7 +1097,7 @@ if (__webpack_require__(7)) {
 
     $export($export.P + $export.F * !CORRECT_ITER_NAME, NAME, $iterators);
 
-    $export($export.P + $export.F * (TypedArrayPrototype.toString != arrayToString), NAME, { toString: arrayToString });
+    if (!LIBRARY && TypedArrayPrototype.toString != arrayToString) TypedArrayPrototype.toString = arrayToString;
 
     $export($export.P + $export.F * fails(function () {
       new TypedArray(1).slice();

diff --git a/client/core.min.js b/client/core.min.js
diff --git a/client/core.min.js.map b/client/core.min.js.map
diff --git a/client/library.js b/client/library.js
@@ -986,7 +986,7 @@ if (__webpack_require__(8)) {
 
     $export($export.P + $export.F * !CORRECT_ITER_NAME, NAME, $iterators);
 
-    $export($export.P + $export.F * (TypedArrayPrototype.toString != arrayToString), NAME, { toString: arrayToString });
+    if (!LIBRARY && TypedArrayPrototype.toString != arrayToString) TypedArrayPrototype.toString = arrayToString;
 
     $export($export.P + $export.F * fails(function () {
       new TypedArray(1).slice();

diff --git a/client/library.min.js b/client/library.min.js
diff --git a/client/library.min.js.map b/client/library.min.js.map
diff --git a/client/shim.js b/client/shim.js
@@ -1015,7 +1015,7 @@ if (__webpack_require__(6)) {
 
     $export($export.P + $export.F * !CORRECT_ITER_NAME, NAME, $iterators);
 
-    $export($export.P + $export.F * (TypedArrayPrototype.toString != arrayToString), NAME, { toString: arrayToString });
+    if (!LIBRARY && TypedArrayPrototype.toString != arrayToString) TypedArrayPrototype.toString = arrayToString;
 
     $export($export.P + $export.F * fails(function () {
       new TypedArray(1).slice();

diff --git a/client/shim.min.js b/client/shim.min.js
diff --git a/client/shim.min.js.map b/client/shim.min.js.map
diff --git a/library/modules/_typed-array.js b/library/modules/_typed-array.js
@@ -462,7 +462,7 @@ if (require('./_descriptors')) {
 
     $export($export.P + $export.F * !CORRECT_ITER_NAME, NAME, $iterators);
 
-    $export($export.P + $export.F * (TypedArrayPrototype.toString != arrayToString), NAME, { toString: arrayToString });
+    if (!LIBRARY && TypedArrayPrototype.toString != arrayToString) TypedArrayPrototype.toString = arrayToString;
 
     $export($export.P + $export.F * fails(function () {
       new TypedArray(1).slice();

diff --git a/modules/_typed-array.js b/modules/_typed-array.js
@@ -462,7 +462,7 @@ if (require('./_descriptors')) {
 
     $export($export.P + $export.F * !CORRECT_ITER_NAME, NAME, $iterators);
 
-    $export($export.P + $export.F * (TypedArrayPrototype.toString != arrayToString), NAME, { toString: arrayToString });
+    if (!LIBRARY && TypedArrayPrototype.toString != arrayToString) TypedArrayPrototype.toString = arrayToString;
 
     $export($export.P + $export.F * fails(function () {
       new TypedArray(1).slice();

diff --git a/tests/es.js b/tests/es.js
diff --git a/tests/tests.js b/tests/tests.js
diff --git a/tests/tests/es6.typed.constructors.ls b/tests/tests/es6.typed.constructors.ls
@@ -161,6 +161,8 @@ if DESCRIPTORS
         assert.throws (!-> Typed 1), TypeError, 'throws without `new`'
         assert.same Typed[Symbol?species], Typed, '@@species'
 
+        assert.ok try Typed.toString!
+
       test "#{name} descriptors" (assert)!->
         typed = new Typed 2
         # V8 ~ Chrome 44- bug - descriptor marked as configurable