ember-data.prod.js in ember-data-source-2.6.0.beta.4

- old
+ new

@@ -4,11 +4,11 @@
 /*!
  * @overview  Ember Data
  * @copyright Copyright 2011-2016 Tilde Inc. and contributors.
  *            Portions Copyright 2011 LivingSocial Inc.
  * @license   Licensed under MIT license (see license.js)
- * @version   2.6.0-beta.3
+ * @version   2.6.0-beta.4
  */
 
 var loader, define, requireModule, require, requirejs;
 
 (function(global) {
@@ -253,11 +253,11 @@
   require('foo/main');
   require.unsee('foo/bar');
 
   requirejs.clear();
 
-  if (typeof module !== 'undefined') {
+  if (typeof exports === 'object' && typeof module === 'object' && module.exports) {
     module.exports = { require: require, define: define };
   }
 })(this);
 
 define("ember-data/-private/adapters", ["exports", "ember-data/adapters/json-api", "ember-data/adapters/rest"], function (exports, _emberDataAdaptersJsonApi, _emberDataAdaptersRest) {
@@ -12422,20 +12422,27 @@
         }
       },
       set: function (key, value) {
         var internalModel = this._internalModel;
         var oldValue = getValue(internalModel, key);
+        var originalValue;
 
         if (value !== oldValue) {
           // Add the new value to the changed attributes hash; it will get deleted by
           // the 'didSetProperty' handler if it is no different from the original value
           internalModel._attributes[key] = value;
 
+          if (key in internalModel._inFlightAttributes) {
+            originalValue = internalModel._inFlightAttributes[key];
+          } else {
+            originalValue = internalModel._data[key];
+          }
+
           this._internalModel.send('didSetProperty', {
             name: key,
             oldValue: oldValue,
-            originalValue: internalModel._data[key],
+            originalValue: originalValue,
             value: value
           });
         }
 
         return value;
@@ -12862,11 +12869,11 @@
       }
 
       if (!embeddedSnapshot) {
         json[serializedKey] = null;
       } else {
-        json[serializedKey] = embeddedSnapshot.record.serialize({ includeId: true });
+        json[serializedKey] = embeddedSnapshot.serialize({ includeId: true });
         this.removeEmbeddedForeignKey(snapshot, embeddedSnapshot, relationship, json[serializedKey]);
 
         if (relationship.options.polymorphic) {
           this.serializePolymorphicType(snapshot, json, relationship);
         }
@@ -13040,11 +13047,11 @@
       var manyArray = _ember.default.A(hasMany);
       var ret = new Array(manyArray.length);
 
       for (var i = 0; i < manyArray.length; i++) {
         var embeddedSnapshot = manyArray[i];
-        var embeddedJson = embeddedSnapshot.record.serialize({ includeId: true });
+        var embeddedJson = embeddedSnapshot.serialize({ includeId: true });
         this.removeEmbeddedForeignKey(snapshot, embeddedSnapshot, relationship, embeddedJson);
         ret[i] = embeddedJson;
       }
 
       return ret;
@@ -15861,10 +15868,10 @@
     */
     deserialize: null
   });
 });
 define("ember-data/version", ["exports"], function (exports) {
-  exports.default = "2.6.0-beta.3";
+  exports.default = "2.6.0-beta.4";
 });
 define("ember-inflector", ["exports", "ember", "ember-inflector/lib/system", "ember-inflector/lib/ext/string"], function (exports, _ember, _emberInflectorLibSystem, _emberInflectorLibExtString) {
 
   _emberInflectorLibSystem.Inflector.defaultRules = _emberInflectorLibSystem.defaultRules;
   _ember.default.Inflector = _emberInflectorLibSystem.Inflector;