dist/globals/ember-data.prod.js in ember-data-source-2.5.0.beta.2 vs dist/globals/ember-data.prod.js in ember-data-source-2.5.0.beta.3
- 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.5.0-beta.2
+ * @version 2.5.0-beta.3
*/
var define, requireModule, require, requirejs;
(function() {
@@ -2223,11 +2223,11 @@
var Promise = _ember.default.RSVP.Promise;
var get = _ember.default.get;
var set = _ember.default.set;
var copy = _ember.default.copy;
- var merge = _ember.default.merge;
+ var assign = _ember.default.assign || _ember.default.merge;
var _extractPivotNameCache = new _emberDataPrivateSystemEmptyObject.default();
var _splitOnDotCache = new _emberDataPrivateSystemEmptyObject.default();
function splitOnDot(name) {
@@ -2415,11 +2415,11 @@
return this.type.inverseFor(key);
},
setupData: function (data) {
var changedKeys = this._changedKeys(data.attributes);
- merge(this._data, data.attributes);
+ assign(this._data, data.attributes);
this.pushedData();
if (this.record) {
this.record._notifyProperties(changedKeys);
}
this.didInitalizeData();
@@ -2527,11 +2527,11 @@
*/
changedAttributes: function () {
var oldData = this._data;
var currentData = this._attributes;
var inFlightData = this._inFlightAttributes;
- var newData = merge(copy(inFlightData), currentData);
+ var newData = assign(copy(inFlightData), currentData);
var diffData = new _emberDataPrivateSystemEmptyObject.default();
var newDataKeys = Object.keys(newData);
for (var i = 0, _length2 = newDataKeys.length; i < _length2; i++) {
@@ -2861,13 +2861,13 @@
}
this.didCleanError();
var changedKeys = this._changedKeys(data);
- merge(this._data, this._inFlightAttributes);
+ assign(this._data, this._inFlightAttributes);
if (data) {
- merge(this._data, data);
+ assign(this._data, data);
}
this._inFlightAttributes = new _emberDataPrivateSystemEmptyObject.default();
this.send('didCommit');
@@ -2993,12 +2993,12 @@
if (updates) {
var original, i, value, key;
var keys = Object.keys(updates);
var length = keys.length;
- original = merge(new _emberDataPrivateSystemEmptyObject.default(), this._data);
- original = merge(original, this._inFlightAttributes);
+ original = assign(new _emberDataPrivateSystemEmptyObject.default(), this._data);
+ original = assign(original, this._inFlightAttributes);
for (i = 0; i < length; i++) {
key = keys[i];
value = updates[key];
@@ -5529,29 +5529,29 @@
});
});
/**
@module ember-data
*/
-define('ember-data/-private/system/references', ['exports', '-private/system/references/record', '-private/system/references/belongs-to', '-private/system/references/has-many'], function (exports, _privateSystemReferencesRecord, _privateSystemReferencesBelongsTo, _privateSystemReferencesHasMany) {
- exports.RecordReference = _privateSystemReferencesRecord.default;
- exports.BelongsToReference = _privateSystemReferencesBelongsTo.default;
- exports.HasManyReference = _privateSystemReferencesHasMany.default;
+define('ember-data/-private/system/references', ['exports', 'ember-data/-private/system/references/record', 'ember-data/-private/system/references/belongs-to', 'ember-data/-private/system/references/has-many'], function (exports, _emberDataPrivateSystemReferencesRecord, _emberDataPrivateSystemReferencesBelongsTo, _emberDataPrivateSystemReferencesHasMany) {
+ exports.RecordReference = _emberDataPrivateSystemReferencesRecord.default;
+ exports.BelongsToReference = _emberDataPrivateSystemReferencesBelongsTo.default;
+ exports.HasManyReference = _emberDataPrivateSystemReferencesHasMany.default;
});
-define('ember-data/-private/system/references/belongs-to', ['exports', 'ember-data/model', 'ember', '-private/system/references/reference', 'ember-data/-private/debug'], function (exports, _emberDataModel, _ember, _privateSystemReferencesReference, _emberDataPrivateDebug) {
+define('ember-data/-private/system/references/belongs-to', ['exports', 'ember-data/model', 'ember', 'ember-data/-private/system/references/reference', 'ember-data/-private/debug'], function (exports, _emberDataModel, _ember, _emberDataPrivateSystemReferencesReference, _emberDataPrivateDebug) {
var BelongsToReference = function (store, parentInternalModel, belongsToRelationship) {
this._super$constructor(store, parentInternalModel);
this.belongsToRelationship = belongsToRelationship;
this.type = belongsToRelationship.relationshipMeta.type;
this.parent = parentInternalModel.recordReference;
// TODO inverse
};
- BelongsToReference.prototype = Object.create(_privateSystemReferencesReference.default.prototype);
+ BelongsToReference.prototype = Object.create(_emberDataPrivateSystemReferencesReference.default.prototype);
BelongsToReference.prototype.constructor = BelongsToReference;
- BelongsToReference.prototype._super$constructor = _privateSystemReferencesReference.default;
+ BelongsToReference.prototype._super$constructor = _emberDataPrivateSystemReferencesReference.default;
BelongsToReference.prototype.remoteType = function () {
if (this.belongsToRelationship.link) {
return "link";
}
@@ -5617,11 +5617,11 @@
});
};
exports.default = BelongsToReference;
});
-define('ember-data/-private/system/references/has-many', ['exports', 'ember', '-private/system/references/reference', 'ember-data/-private/debug'], function (exports, _ember, _privateSystemReferencesReference, _emberDataPrivateDebug) {
+define('ember-data/-private/system/references/has-many', ['exports', 'ember', 'ember-data/-private/system/references/reference', 'ember-data/-private/debug'], function (exports, _ember, _emberDataPrivateSystemReferencesReference, _emberDataPrivateDebug) {
var get = _ember.default.get;
var HasManyReference = function (store, parentInternalModel, hasManyRelationship) {
this._super$constructor(store, parentInternalModel);
@@ -5630,13 +5630,13 @@
this.parent = parentInternalModel.recordReference;
// TODO inverse
};
- HasManyReference.prototype = Object.create(_privateSystemReferencesReference.default.prototype);
+ HasManyReference.prototype = Object.create(_emberDataPrivateSystemReferencesReference.default.prototype);
HasManyReference.prototype.constructor = HasManyReference;
- HasManyReference.prototype._super$constructor = _privateSystemReferencesReference.default;
+ HasManyReference.prototype._super$constructor = _emberDataPrivateSystemReferencesReference.default;
HasManyReference.prototype.remoteType = function () {
if (this.hasManyRelationship.link) {
return "link";
}
@@ -5717,21 +5717,21 @@
return this.hasManyRelationship.reload();
};
exports.default = HasManyReference;
});
-define('ember-data/-private/system/references/record', ['exports', 'ember', '-private/system/references/reference'], function (exports, _ember, _privateSystemReferencesReference) {
+define('ember-data/-private/system/references/record', ['exports', 'ember', 'ember-data/-private/system/references/reference'], function (exports, _ember, _emberDataPrivateSystemReferencesReference) {
var RecordReference = function (store, internalModel) {
this._super$constructor(store, internalModel);
this.type = internalModel.modelName;
this._id = internalModel.id;
};
- RecordReference.prototype = Object.create(_privateSystemReferencesReference.default.prototype);
+ RecordReference.prototype = Object.create(_emberDataPrivateSystemReferencesReference.default.prototype);
RecordReference.prototype.constructor = RecordReference;
- RecordReference.prototype._super$constructor = _privateSystemReferencesReference.default;
+ RecordReference.prototype._super$constructor = _emberDataPrivateSystemReferencesReference.default;
RecordReference.prototype.id = function () {
return this._id;
};
@@ -7801,10 +7801,11 @@
var get = _ember.default.get;
var set = _ember.default.set;
var once = _ember.default.run.once;
var isNone = _ember.default.isNone;
+ var isPresent = _ember.default.isPresent;
var Promise = _ember.default.RSVP.Promise;
var copy = _ember.default.copy;
var Store;
var Service = _ember.default.Service;
@@ -9683,10 +9684,12 @@
}
});
define('ember-data/-private/system/store/container-instance-cache', ['exports', 'ember', 'ember-data/-private/system/empty-object'], function (exports, _ember, _emberDataPrivateSystemEmptyObject) {
exports.default = ContainerInstanceCache;
+ var assign = _ember.default.assign || _ember.default.merge;
+
/**
* The `ContainerInstanceCache` serves as a lazy cache for looking up
* instances of serializers and adapters. It has some additional logic for
* finding the 'fallback' adapter or serializer.
*
@@ -9709,11 +9712,11 @@
this._cache = new _emberDataPrivateSystemEmptyObject.default();
}
ContainerInstanceCache.prototype = new _emberDataPrivateSystemEmptyObject.default();
- _ember.default.merge(ContainerInstanceCache.prototype, {
+ assign(ContainerInstanceCache.prototype, {
get: function (type, preferredKey, fallbacks) {
var cache = this._cache;
var preferredLookupKey = type + ':' + preferredKey;
if (!(preferredLookupKey in cache)) {
@@ -9952,11 +9955,10 @@
return promise.then(function (adapterPayload) {
var record;
store._adapterRun(function () {
var payload = (0, _emberDataPrivateSystemStoreSerializerResponse.normalizeResponseHelper)(serializer, store, typeClass, adapterPayload, null, 'queryRecord');
-
//TODO Optimize
record = store.push(payload);
});
return record;
@@ -13163,11 +13165,11 @@
define('ember-data/serializers/json', ['exports', 'ember', 'ember-data/-private/debug', 'ember-data/serializer', 'ember-data/-private/system/coerce-id', 'ember-data/-private/system/normalize-model-name', 'ember-data/-private/utils', 'ember-data/-private/adapters/errors', 'ember-data/-private/features'], function (exports, _ember, _emberDataPrivateDebug, _emberDataSerializer, _emberDataPrivateSystemCoerceId, _emberDataPrivateSystemNormalizeModelName, _emberDataPrivateUtils, _emberDataPrivateAdaptersErrors, _emberDataPrivateFeatures) {
function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) arr2[i] = arr[i]; return arr2; } else { return Array.from(arr); } }
var get = _ember.default.get;
var isNone = _ember.default.isNone;
- var merge = _ember.default.merge;
+ var assign = _ember.default.assign || _ember.default.merge;
/**
Ember Data 2.0 Serializer:
In Ember Data a Serializer is used to serialize and deserialize
@@ -14137,11 +14139,11 @@
@param {DS.Model} typeClass
@param {DS.Snapshot} snapshot
@param {Object} options
*/
serializeIntoHash: function (hash, typeClass, snapshot, options) {
- merge(hash, this.serialize(snapshot, options));
+ assign(hash, this.serialize(snapshot, options));
},
/**
`serializeAttribute` can be used to customize how `DS.attr`
properties are serialized
@@ -14636,12 +14638,12 @@
var serializer = undefined,
modelClass = undefined;
var primaryHasTypeAttribute = (0, _emberDataPrivateUtils.modelHasAttributeOrRelationshipNamedType)(primaryModelClass);
// Support polymorphic records in async relationships
if (!primaryHasTypeAttribute && hash.type && store._hasModelFor(this.modelNameFromPayloadKey(hash.type))) {
- serializer = store.serializerFor(hash.type);
- modelClass = store.modelFor(hash.type);
+ serializer = store.serializerFor(this.modelNameFromPayloadKey(hash.type));
+ modelClass = store.modelFor(this.modelNameFromPayloadKey(hash.type));
} else {
serializer = primarySerializer;
modelClass = primaryModelClass;
}
return serializer.normalize(modelClass, hash, prop);
@@ -15253,58 +15255,58 @@
*/
deserialize: null
});
});
define("ember-data/version", ["exports"], function (exports) {
- exports.default = "2.5.0-beta.2";
+ exports.default = "2.5.0-beta.3";
});
-define("ember-inflector", ["exports", "ember", "lib/system", "lib/ext/string"], function (exports, _ember, _libSystem, _libExtString) {
+define("ember-inflector", ["exports", "ember", "ember-inflector/lib/system", "ember-inflector/lib/ext/string"], function (exports, _ember, _emberInflectorLibSystem, _emberInflectorLibExtString) {
- _libSystem.Inflector.defaultRules = _libSystem.defaultRules;
- _ember.default.Inflector = _libSystem.Inflector;
+ _emberInflectorLibSystem.Inflector.defaultRules = _emberInflectorLibSystem.defaultRules;
+ _ember.default.Inflector = _emberInflectorLibSystem.Inflector;
- _ember.default.String.pluralize = _libSystem.pluralize;
- _ember.default.String.singularize = _libSystem.singularize;
+ _ember.default.String.pluralize = _emberInflectorLibSystem.pluralize;
+ _ember.default.String.singularize = _emberInflectorLibSystem.singularize;
- exports.default = _libSystem.Inflector;
- exports.pluralize = _libSystem.pluralize;
- exports.singularize = _libSystem.singularize;
- exports.defaultRules = _libSystem.defaultRules;
+ exports.default = _emberInflectorLibSystem.Inflector;
+ exports.pluralize = _emberInflectorLibSystem.pluralize;
+ exports.singularize = _emberInflectorLibSystem.singularize;
+ exports.defaultRules = _emberInflectorLibSystem.defaultRules;
if (typeof define !== 'undefined' && define.amd) {
define('ember-inflector', ['exports'], function (__exports__) {
- __exports__['default'] = _libSystem.Inflector;
- return _libSystem.Inflector;
+ __exports__['default'] = _emberInflectorLibSystem.Inflector;
+ return _emberInflectorLibSystem.Inflector;
});
} else if (typeof module !== 'undefined' && module['exports']) {
- module['exports'] = _libSystem.Inflector;
+ module['exports'] = _emberInflectorLibSystem.Inflector;
}
});
/* global define, module */
-define('ember-inflector/lib/ext/string', ['exports', 'ember', 'lib/system/string'], function (exports, _ember, _libSystemString) {
+define('ember-inflector/lib/ext/string', ['exports', 'ember', 'ember-inflector/lib/system/string'], function (exports, _ember, _emberInflectorLibSystemString) {
if (_ember.default.EXTEND_PROTOTYPES === true || _ember.default.EXTEND_PROTOTYPES.String) {
/**
See {{#crossLink "Ember.String/pluralize"}}{{/crossLink}}
@method pluralize
@for String
*/
String.prototype.pluralize = function () {
- return (0, _libSystemString.pluralize)(this);
+ return (0, _emberInflectorLibSystemString.pluralize)(this);
};
/**
See {{#crossLink "Ember.String/singularize"}}{{/crossLink}}
@method singularize
@for String
*/
String.prototype.singularize = function () {
- return (0, _libSystemString.singularize)(this);
+ return (0, _emberInflectorLibSystemString.singularize)(this);
};
}
});
-define('ember-inflector/lib/helpers/pluralize', ['exports', 'ember-inflector', 'lib/utils/make-helper'], function (exports, _emberInflector, _libUtilsMakeHelper) {
+define('ember-inflector/lib/helpers/pluralize', ['exports', 'ember-inflector', 'ember-inflector/lib/utils/make-helper'], function (exports, _emberInflector, _emberInflectorLibUtilsMakeHelper) {
/**
*
* If you have Ember Inflector (such as if Ember Data is present),
* pluralize a word. For example, turn "ox" into "oxen".
@@ -15319,11 +15321,11 @@
* @for Ember.HTMLBars.helpers
* @method pluralize
* @param {Number|Property} [count] count of objects
* @param {String|Property} word word to pluralize
*/
- exports.default = (0, _libUtilsMakeHelper.default)(function (params) {
+ exports.default = (0, _emberInflectorLibUtilsMakeHelper.default)(function (params) {
var count = undefined,
word = undefined;
if (params.length === 1) {
word = params[0];
@@ -15338,11 +15340,11 @@
return count + " " + word;
}
});
});
-define('ember-inflector/lib/helpers/singularize', ['exports', 'ember-inflector', 'lib/utils/make-helper'], function (exports, _emberInflector, _libUtilsMakeHelper) {
+define('ember-inflector/lib/helpers/singularize', ['exports', 'ember-inflector', 'ember-inflector/lib/utils/make-helper'], function (exports, _emberInflector, _emberInflectorLibUtilsMakeHelper) {
/**
*
* If you have Ember Inflector (such as if Ember Data is present),
* singularize a word. For example, turn "oxen" into "ox".
@@ -15354,22 +15356,22 @@
*
* @for Ember.HTMLBars.helpers
* @method singularize
* @param {String|Property} word word to singularize
*/
- exports.default = (0, _libUtilsMakeHelper.default)(function (params) {
+ exports.default = (0, _emberInflectorLibUtilsMakeHelper.default)(function (params) {
return (0, _emberInflector.singularize)(params[0]);
});
});
-define("ember-inflector/lib/system", ["exports", "lib/system/inflector", "lib/system/string", "lib/system/inflections"], function (exports, _libSystemInflector, _libSystemString, _libSystemInflections) {
+define("ember-inflector/lib/system", ["exports", "ember-inflector/lib/system/inflector", "ember-inflector/lib/system/string", "ember-inflector/lib/system/inflections"], function (exports, _emberInflectorLibSystemInflector, _emberInflectorLibSystemString, _emberInflectorLibSystemInflections) {
- _libSystemInflector.default.inflector = new _libSystemInflector.default(_libSystemInflections.default);
+ _emberInflectorLibSystemInflector.default.inflector = new _emberInflectorLibSystemInflector.default(_emberInflectorLibSystemInflections.default);
- exports.Inflector = _libSystemInflector.default;
- exports.singularize = _libSystemString.singularize;
- exports.pluralize = _libSystemString.pluralize;
- exports.defaultRules = _libSystemInflections.default;
+ exports.Inflector = _emberInflectorLibSystemInflector.default;
+ exports.singularize = _emberInflectorLibSystemString.singularize;
+ exports.pluralize = _emberInflectorLibSystemString.pluralize;
+ exports.defaultRules = _emberInflectorLibSystemInflections.default;
});
define('ember-inflector/lib/system/inflections', ['exports'], function (exports) {
exports.default = {
plurals: [[/$/, 's'], [/s$/i, 's'], [/^(ax|test)is$/i, '$1es'], [/(octop|vir)us$/i, '$1i'], [/(octop|vir)i$/i, '$1i'], [/(alias|status)$/i, '$1es'], [/(bu)s$/i, '$1ses'], [/(buffal|tomat)o$/i, '$1oes'], [/([ti])um$/i, '$1a'], [/([ti])a$/i, '$1a'], [/sis$/i, 'ses'], [/(?:([^f])fe|([lr])f)$/i, '$1$2ves'], [/(hive)$/i, '$1s'], [/([^aeiouy]|qu)y$/i, '$1ies'], [/(x|ch|ss|sh)$/i, '$1es'], [/(matr|vert|ind)(?:ix|ex)$/i, '$1ices'], [/^(m|l)ouse$/i, '$1ice'], [/^(m|l)ice$/i, '$1ice'], [/^(ox)$/i, '$1en'], [/^(oxen)$/i, '$1'], [/(quiz)$/i, '$1zes']],
@@ -15683,17 +15685,17 @@
}
};
exports.default = Inflector;
});
-define('ember-inflector/lib/system/string', ['exports', 'lib/system/inflector'], function (exports, _libSystemInflector) {
+define('ember-inflector/lib/system/string', ['exports', 'ember-inflector/lib/system/inflector'], function (exports, _emberInflectorLibSystemInflector) {
function pluralize(word) {
- return _libSystemInflector.default.inflector.pluralize(word);
+ return _emberInflectorLibSystemInflector.default.inflector.pluralize(word);
}
function singularize(word) {
- return _libSystemInflector.default.inflector.singularize(word);
+ return _emberInflectorLibSystemInflector.default.inflector.singularize(word);
}
exports.pluralize = pluralize;
exports.singularize = singularize;
});