Merge pull request #183 from andyearnshaw/define-properties

fixes #182: improving Object.defineProperty() detection mechanism
sebastian-software · Jun 16, 2016 · 8b09c08 · 8b09c08
2 parents bdd9c9c + 9ba894c
commit 8b09c08
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/src/12.datetimeformat.js b/src/12.datetimeformat.js
@@ -789,11 +789,6 @@ defineProperty(Intl.DateTimeFormat, 'supportedLocalesOf', {
     get: GetFormatDateTime
 });
 
-defineProperty(Intl.DateTimeFormat.prototype, 'formatToParts', {
-    configurable: true,
-    get: GetFormatToPartsDateTime
-});
-
 function GetFormatDateTime() {
     let internal = this !== null && typeof this === 'object' && getInternalProperties(this);
 
@@ -836,7 +831,7 @@ function GetFormatDateTime() {
     return internal['[[boundFormat]]'];
 }
 
-function GetFormatToPartsDateTime() {
+Intl.DateTimeFormat.prototype.formatToParts = function formatToParts() {
     let internal = this !== null && typeof this === 'object' && getInternalProperties(this);
 
     if (!internal || !internal['[[initializedDateTimeFormat]]'])
@@ -851,7 +846,7 @@ function GetFormatToPartsDateTime() {
         internal['[[boundFormatToParts]]'] = bf;
     }
     return internal['[[boundFormatToParts]]'];
-}
+};
 
 function CreateDateTimeParts(dateTimeFormat, x) {
     // 1. If x is not a finite Number, then throw a RangeError exception.

diff --git a/src/util.js b/src/util.js
@@ -1,8 +1,12 @@
 const realDefineProp = (function () {
         let sentinel = {};
         try {
-            Object.defineProperty(sentinel, 'a', {});
-            return 'a' in sentinel;
+            Object.defineProperty(sentinel, 'a', {
+                get: function () {
+                    return 1;
+                }
+            });
+            return sentinel.a === 1;
         } catch (e) {
             return false;
         }