Merge pull request #16543 from bekzod/collapse-if

collapse `if` statement in `defineProperty`
emberjs · Apr 18, 2018 · 3f0652d · 3f0652d
2 parents a4bbcac + b1d4c89
commit 3f0652d
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/packages/ember-metal/lib/properties.js b/packages/ember-metal/lib/properties.js
@@ -185,14 +185,7 @@ export function defineProperty(obj, keyName, desc, data, meta) {
       };
 
       Object.defineProperty(obj, keyName, defaultDescriptor);
-    } else if (wasDescriptor) {
-      Object.defineProperty(obj, keyName, {
-        configurable: true,
-        enumerable,
-        writable: true,
-        value,
-      });
-    } else if (enumerable === false) {
+    } else if (wasDescriptor || enumerable === false) {
       Object.defineProperty(obj, keyName, {
         configurable: true,
         enumerable,