Merge pull request #11462 from stefanpenner/define-property-cleanup

[CLEANUP Beta] remove Object.defineProperty polyfil
emberjs · Jun 15, 2015 · 89510c7 · 89510c7
2 parents 8115fbc + edcf8b6
commit 89510c7
Show file tree

Hide file tree

Showing 22 changed files with 260 additions and 742 deletions.
diff --git a/packages/ember-metal/lib/deprecate_property.js b/packages/ember-metal/lib/deprecate_property.js
@@ -4,8 +4,6 @@
 */
 
 import Ember from "ember-metal/core";
-import { hasPropertyAccessors } from "ember-metal/platform/define_property";
-import { defineProperty } from "ember-metal/properties";
 import { get } from "ember-metal/property_get";
 import { set } from "ember-metal/property_set";
 
@@ -27,18 +25,16 @@ export function deprecateProperty(object, deprecatedKey, newKey) {
     Ember.deprecate(`Usage of \`${deprecatedKey}\` is deprecated, use \`${newKey}\` instead.`);
   }
 
-  if (hasPropertyAccessors) {
-    defineProperty(object, deprecatedKey, {
-      configurable: true,
-      enumerable: false,
-      set(value) {
-        deprecate();
-        set(this, newKey, value);
-      },
-      get() {
-        deprecate();
-        return get(this, newKey);
-      }
-    });
-  }
+  Object.defineProperty(object, deprecatedKey, {
+    configurable: true,
+    enumerable: false,
+    set(value) {
+      deprecate();
+      set(this, newKey, value);
+    },
+    get() {
+      deprecate();
+      return get(this, newKey);
+    }
+  });
 }
diff --git a/packages/ember-metal/lib/keys.js b/packages/ember-metal/lib/keys.js
@@ -1,5 +1,3 @@
-import { canDefineNonEnumerableProperties } from 'ember-metal/platform/define_property';
-
 /**
   Returns all of the keys defined on an object or hash. This is useful
   when inspecting objects for debugging. On browsers that support it, this
@@ -13,7 +11,7 @@ import { canDefineNonEnumerableProperties } from 'ember-metal/platform/define_pr
 */
 var keys = Object.keys;
 
-if (!keys || !canDefineNonEnumerableProperties) {
+if (!keys) {
   // modified from
   // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/keys
   keys = (function() {

diff --git a/packages/ember-metal/lib/main.js b/packages/ember-metal/lib/main.js
@@ -36,9 +36,6 @@ import {
 } from "ember-metal/utils";
 import EmberError from "ember-metal/error";
 import Cache from "ember-metal/cache";
-import {
-  hasPropertyAccessors
-} from 'ember-metal/platform/define_property';
 import create from 'ember-metal/platform/create';
 import Logger from "ember-metal/logger";
 
@@ -231,8 +228,8 @@ Ember.GUID_KEY        = GUID_KEY;
 Ember.create          = create;
 Ember.keys            = keys;
 Ember.platform        = {
-  defineProperty: defineProperty,
-  hasPropertyAccessors: hasPropertyAccessors
+  defineProperty: true,
+  hasPropertyAccessors: true
 };
 
 Ember.Error           = EmberError;

diff --git a/packages/ember-metal/lib/platform/create.js b/packages/ember-metal/lib/platform/create.js
@@ -3,7 +3,6 @@
 //
 "REMOVE_USE_STRICT: true";
 
-import defineProperties from 'ember-metal/platform/define_properties';
 
 /**
 @class platform
@@ -91,7 +90,7 @@ if (!(Object.create && !Object.create(null).hasOwnProperty)) {
     }
 
     if (properties !== undefined) {
-      defineProperties(object, properties);
+      Object.defineProperties(object, properties);
     }
 
     return object;

diff --git a/packages/ember-metal/lib/platform/define_properties.js b/packages/ember-metal/lib/platform/define_properties.js
diff --git a/packages/ember-metal/lib/platform/define_property.js b/packages/ember-metal/lib/platform/define_property.js
diff --git a/packages/ember-metal/lib/properties.js b/packages/ember-metal/lib/properties.js
@@ -5,10 +5,6 @@
 import Ember from "ember-metal/core";
 import isEnabled from "ember-metal/features";
 import { meta as metaFor } from "ember-metal/utils";
-import {
-  defineProperty as objectDefineProperty,
-  hasPropertyAccessors
-} from 'ember-metal/platform/define_property';
 import { overrideChains } from "ember-metal/property_events";
 // ..........................................................
 // DESCRIPTOR
@@ -105,10 +101,9 @@ export function defineProperty(obj, keyName, desc, data, meta) {
 
   if (desc instanceof Descriptor) {
     value = desc;
-
     if (isEnabled('mandatory-setter')) {
-      if (watching && hasPropertyAccessors) {
-        objectDefineProperty(obj, keyName, {
+      if (watching) {
+        Object.defineProperty(obj, keyName, {
           configurable: true,
           enumerable: true,
           writable: true,
@@ -126,9 +121,9 @@ export function defineProperty(obj, keyName, desc, data, meta) {
       value = data;
 
       if (isEnabled('mandatory-setter')) {
-        if (watching && hasPropertyAccessors) {
+        if (watching) {
           meta.values[keyName] = data;
-          objectDefineProperty(obj, keyName, {
+          Object.defineProperty(obj, keyName, {
             configurable: true,
             enumerable: true,
             set: MANDATORY_SETTER_FUNCTION(keyName),
@@ -144,7 +139,7 @@ export function defineProperty(obj, keyName, desc, data, meta) {
       value = desc;
 
       // compatibility with ES5
-      objectDefineProperty(obj, keyName, desc);
+      Object.oefineProperty(obj, keyName, desc);
     }
   }
 

diff --git a/packages/ember-metal/lib/property_get.js b/packages/ember-metal/lib/property_get.js
@@ -10,7 +10,6 @@ import {
   isPath,
   hasThis as pathHasThis
 } from "ember-metal/path_cache";
-import { hasPropertyAccessors } from "ember-metal/platform/define_property";
 import { symbol } from "ember-metal/utils";
 import isNone from 'ember-metal/is_none';
 
@@ -87,7 +86,7 @@ export function get(obj, keyName) {
     return desc.get(obj, keyName);
   } else {
     if (isEnabled('mandatory-setter')) {
-      if (hasPropertyAccessors && meta && meta.watching[keyName] > 0) {
+      if (meta && meta.watching[keyName] > 0) {
         ret = meta.values[keyName];
       } else {
         ret = obj[keyName];

diff --git a/packages/ember-metal/lib/property_set.js b/packages/ember-metal/lib/property_set.js
@@ -12,7 +12,6 @@ import {
   isPath,
   isGlobalPath
 } from "ember-metal/path_cache";
-import { hasPropertyAccessors } from "ember-metal/platform/define_property";
 
 import { symbol } from "ember-metal/utils";
 export let INTERCEPT_SET = symbol("INTERCEPT_SET");
@@ -87,11 +86,7 @@ export function set(obj, keyName, value, tolerant) {
     } else if (meta && meta.watching[keyName] > 0) {
       if (meta.proto !== obj) {
         if (isEnabled('mandatory-setter')) {
-          if (hasPropertyAccessors) {
-            currentValue = meta.values[keyName];
-          } else {
-            currentValue = obj[keyName];
-          }
+          currentValue = meta.values[keyName];
         } else {
           currentValue = obj[keyName];
         }
@@ -100,17 +95,13 @@ export function set(obj, keyName, value, tolerant) {
       if (value !== currentValue) {
         propertyWillChange(obj, keyName);
         if (isEnabled('mandatory-setter')) {
-          if (hasPropertyAccessors) {
-            if (
-              (currentValue === undefined && !(keyName in obj)) ||
-              !Object.prototype.propertyIsEnumerable.call(obj, keyName)
-            ) {
-              defineProperty(obj, keyName, null, value); // setup mandatory setter
-            } else {
-              meta.values[keyName] = value;
-            }
+          if (
+            (currentValue === undefined && !(keyName in obj)) ||
+            !Object.prototype.propertyIsEnumerable.call(obj, keyName)
+          ) {
+            defineProperty(obj, keyName, null, value); // setup mandatory setter
           } else {
-            obj[keyName] = value;
+            meta.values[keyName] = value;
           }
         } else {
           obj[keyName] = value;