Skip to content

Commit 0a779c1

Browse files
committed
[BUGFIX beta] Remove nested stripped statements.
1 parent 05847de commit 0a779c1

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

packages/container/lib/registry.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ import Container from './container';
44

55
var VALID_FULL_NAME_REGEXP = /^[^:]+.+:[^:]+$/;
66

7+
var instanceInitializersFeatureEnabled;
8+
if (Ember.FEATURES.isEnabled('ember-application-instance-initializers')) {
9+
instanceInitializersFeatureEnabled = true;
10+
}
11+
712
/**
813
A lightweight registry used to store factory and option information keyed
914
by type.
@@ -171,7 +176,7 @@ Registry.prototype = {
171176
lookup: function(fullName, options) {
172177
Ember.assert('Create a container on the registry (with `registry.container()`) before calling `lookup`.', this._defaultContainer);
173178

174-
if (Ember.FEATURES.isEnabled('ember-application-instance-initializers')) {
179+
if (instanceInitializersFeatureEnabled) {
175180
Ember.deprecate('`lookup` was called on a Registry. The `initializer` API no longer receives a container, and you should use an `instanceInitializer` to look up objects from the container.', { url: "http://emberjs.com/guides/deprecations#toc_deprecate-access-to-instances-in-initializers" });
176181
}
177182

@@ -181,7 +186,7 @@ Registry.prototype = {
181186
lookupFactory: function(fullName) {
182187
Ember.assert('Create a container on the registry (with `registry.container()`) before calling `lookupFactory`.', this._defaultContainer);
183188

184-
if (Ember.FEATURES.isEnabled('ember-application-instance-initializers')) {
189+
if (instanceInitializersFeatureEnabled) {
185190
Ember.deprecate('`lookupFactory` was called on a Registry. The `initializer` API no longer receives a container, and you should use an `instanceInitializer` to look up objects from the container.', { url: "http://emberjs.com/guides/deprecations#toc_deprecate-access-to-instances-in-initializers" });
186191
}
187192

packages/ember-application/tests/system/instance_initializers_test.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ import ApplicationInstance from "ember-application/system/application-instance";
44
import { indexOf } from "ember-metal/array";
55
import jQuery from "ember-views/system/jquery";
66

7-
var app;
7+
var app, initializeContextFeatureEnabled;
8+
9+
if (Ember.FEATURES.isEnabled("ember-application-initializer-context")) {
10+
initializeContextFeatureEnabled = true;
11+
}
812

913
if (Ember.FEATURES.isEnabled('ember-application-instance-initializers')) {
1014
QUnit.module("Ember.Application instance initializers", {
@@ -323,7 +327,7 @@ if (Ember.FEATURES.isEnabled('ember-application-instance-initializers')) {
323327
});
324328
});
325329

326-
if (Ember.FEATURES.isEnabled("ember-application-initializer-context")) {
330+
if (initializeContextFeatureEnabled) {
327331
QUnit.test("initializers should be executed in their own context", function() {
328332
expect(1);
329333

0 commit comments

Comments
 (0)