dist/globals/ember-data.prod.js in ember-data-source-2.13.0 vs dist/globals/ember-data.prod.js in ember-data-source-2.13.1
- old
+ new
@@ -4,11 +4,11 @@
/*!
* @overview Ember Data
* @copyright Copyright 2011-2017 Tilde Inc. and contributors.
* Portions Copyright 2011 LivingSocial Inc.
* @license Licensed under MIT license (see license.js)
- * @version 2.13.0
+ * @version 2.13.1
*/
var loader, define, requireModule, require, requirejs;
(function (global) {
@@ -229,11 +229,15 @@
function Alias(path) {
this.name = path;
}
- define.alias = function (path) {
+ define.alias = function (path, target) {
+ if (arguments.length === 2) {
+ return define(target, new Alias(path));
+ }
+
return new Alias(path);
};
function missingModule(name, referrer) {
throw new Error('Could not find module `' + name + '` imported from `' + referrer + '`');
@@ -308,10 +312,11 @@
require('foo/bar');
}
});
define('foo/baz', [], define.alias('foo'));
define('foo/quz', define.alias('foo'));
+ define.alias('foo', 'foo/qux');
define('foo/bar', ['foo', './quz', './baz', './asdf', './bar', '../foo'], function () {});
define('foo/main', ['foo/bar'], function () {});
require('foo/main');
require.unsee('foo/bar');
@@ -1084,19 +1089,24 @@
/*
Configures a registry for use with an Ember-Data
store.
@method initializeStoreService
- @param {Ember.ApplicationInstance} applicationOrRegistry
+ @param {Ember.ApplicationInstance | Ember.EngineInstance} instance
*/
- function initializeStoreService(application) {
- var container = application.lookup ? application : application.container;
+ function initializeStoreService(instance) {
+ // instance.lookup supports Ember 2.1 and higher
+ // instance.container supports Ember 1.11 - 2.0
+ var container = instance.lookup ? instance : instance.container;
+
// Eagerly generate the store so defaultStore is populated.
container.lookup('service:store');
- var initializers = application.application.constructor.initializers;
- deprecateOldEmberDataInitializers(initializers);
+ // In Ember 2.4+ instance.base is the `Ember.Application` or `Ember.Engine` instance
+ // In Ember 1.11 - 2.3 we fallback to `instance.application`
+ var base = instance.base || instance.application;
+ deprecateOldEmberDataInitializers(base.constructor.initializers);
}
var deprecatedInitializerNames = ['data-adapter', 'injectStore', 'transforms', 'store'];
function matchesDeprecatedInititalizer(name) {
@@ -16679,10 +16689,10 @@
});
define("ember-data/version", ["exports"], function (exports) {
"use strict";
exports.__esModule = true;
- exports.default = "2.13.0";
+ exports.default = "2.13.1";
});
define("ember-inflector", ["module", "exports", "ember", "ember-inflector/lib/system", "ember-inflector/lib/ext/string"], function (module, exports, _ember, _system) {
"use strict";
exports.__esModule = true;