dist/ember.prod.js in ember-source-2.12.1 vs dist/ember.prod.js in ember-source-2.12.2
- old
+ new
@@ -4,11 +4,11 @@
* @copyright Copyright 2011-2017 Tilde Inc. and contributors
* Portions Copyright 2006-2011 Strobe Inc.
* Portions Copyright 2008-2011 Apple Inc. All rights reserved.
* @license Licensed under MIT license
* See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version 2.12.1
+ * @version 2.12.2
*/
var enifed, requireModule, Ember;
var mainContext = this; // Used in ember-environment/lib/global.js
@@ -1558,12 +1558,10 @@
if (arguments[i]) {
injections = injections.concat(arguments[i]);
}
}
- container.registry.validateInjections(injections);
-
for (var i = 0; i < injections.length; i++) {
injection = injections[i];
hash[injection.property] = lookup(container, injection.fullName);
if (!isSingleton(container, injection.fullName)) {
markInjectionsAsDynamic(hash);
@@ -1700,29 +1698,31 @@
factoryInjections._debugContainerKey = fullName;
return factoryInjections;
}
+ var INJECTED_DEPRECATED_CONTAINER_DESC = {
+ configurable: true,
+ enumerable: false,
+ get: function () {
+ return this[CONTAINER_OVERRIDE] || _emberUtils.getOwner(this).__container__;
+ },
+
+ set: function (value) {
+
+ this[CONTAINER_OVERRIDE] = value;
+
+ return value;
+ }
+ };
+
// TODO - remove when Ember reaches v3.0.0
function injectDeprecatedContainer(object, container) {
if ('container' in object) {
return;
}
- Object.defineProperty(object, 'container', {
- configurable: true,
- enumerable: false,
- get: function () {
- return this[CONTAINER_OVERRIDE] || container;
- },
-
- set: function (value) {
-
- this[CONTAINER_OVERRIDE] = value;
-
- return value;
- }
- });
+ Object.defineProperty(object, 'container', INJECTED_DEPRECATED_CONTAINER_DESC);
}
function eachDestroyable(container, callback) {
var cache = container.cache;
var keys = Object.keys(cache);
@@ -16646,11 +16646,11 @@
// To maintain stacktrace consistency across browsers
var getStack = function (error) {
var stack = error.stack;
var message = error.message;
- if (stack && !stack.includes(message)) {
+ if (stack && stack.indexOf(message) === -1) {
stack = message + '\n' + stack;
}
return stack;
};
@@ -40201,10 +40201,10 @@
// reduced computed macros
enifed("ember/version", ["exports"], function (exports) {
"use strict";
- exports.default = "2.12.1";
+ exports.default = "2.12.2";
});
enifed('internal-test-helpers/apply-mixins', ['exports', 'ember-utils'], function (exports, _emberUtils) {
'use strict';
exports.default = applyMixins;