Change to leave logic to existing state machine. Now things should 'j…

…ust work'
emberjs · May 10, 2016 · 3382029 · 3382029
1 parent 82abc18
commit 3382029
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/addon/-private/system/model/internal-model.js b/addon/-private/system/model/internal-model.js
@@ -854,13 +854,18 @@ InternalModel.prototype = {
 }
 
 if (isEnabled('ds-reset-attribute')) {
-  InternalModel.prototype.resetAttribute = function resetAttribute(attributeName) {
-    var attrs = this._attributes;
-    var dirtyKeys = Object.keys(attrs);
-    if (dirtyKeys.indexOf(attributeName) !== -1) {
-      delete this._attributes[attributeName];
-      this.send('propertyWasReset', attributeName);
-      this.record.notifyPropertyChange(attributeName);
+  /*
+     Returns the latest truth for an attribute - the canonical value, or the
+     in-flight value.
+
+     @method latestTrueValue
+     @private
+  */
+  InternalModel.prototype.latestTrueValue = function latestTrueValue(key) {
+    if (key in this._inFlightAttributes) {
+      return this._inFlightAttributes[key];
+    } else {
+      return this._data[key];
     }
-  }
+  };
 }
diff --git a/addon/-private/system/model/model.js b/addon/-private/system/model/model.js
@@ -1001,7 +1001,9 @@ if (isEnabled('ds-reset-attribute')) {
       @method resetAttribute
     */
     resetAttribute(attributeName) {
-      this._internalModel.resetAttribute(attributeName);
+      if (attributeName in this._internalModel._attributes) {
+        this.set(attributeName, this._internalModel.latestTrueValue(attributeName));
+      }
     }
   });
 }