Merge pull request #109 from mike-north/new-initializer

Align with container cleanup
ember-cli · Aug 24, 2015 · 85368b0 · 85368b0
2 parents 3d70001 + a3975c6
commit 85368b0
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 15 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.1.17
+0.1.20
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-resolver",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "license": "MIT",
   "main": ["dist/ember-resolver.js", "dist/ember-resolver.prod.js", "dist/ember-resolver.min.js"],
   "ignore": [

diff --git a/dist/ember-resolver-spade.js b/dist/ember-resolver-spade.js
diff --git a/dist/ember-resolver.js b/dist/ember-resolver.js
@@ -6,7 +6,7 @@
 // ==========================================================================
 
 
- // Version: 0.1.17
+ // Version: 0.1.20
 
 (function() {
 /*globals define registry requirejs */
@@ -542,11 +542,12 @@ define("ember/container-debug-adapter",
   Ember.Application.initializer({
     name: 'container-debug-adapter',
 
-    initialize: function(container, app) {
+    initialize: function() {
+      var app = arguments[1] || arguments[0];
       var ContainerDebugAdapter = require('ember/container-debug-adapter');
       var Resolver = require('ember/resolver');
 
-      container.register('container-debug-adapter:main', ContainerDebugAdapter);
+      app.register('container-debug-adapter:main', ContainerDebugAdapter);
       app.inject('container-debug-adapter:main', 'namespace', 'application:main');
     }
   });

diff --git a/dist/ember-resolver.min.js b/dist/ember-resolver.min.js
diff --git a/dist/ember-resolver.prod.js b/dist/ember-resolver.prod.js
@@ -6,7 +6,7 @@
 // ==========================================================================
 
 
- // Version: 0.1.17
+ // Version: 0.1.20
 
 (function() {
 /*globals define registry requirejs */
@@ -542,11 +542,12 @@ define("ember/container-debug-adapter",
   Ember.Application.initializer({
     name: 'container-debug-adapter',
 
-    initialize: function(container, app) {
+    initialize: function() {
+      var app = arguments[1] || arguments[0];
       var ContainerDebugAdapter = require('ember/container-debug-adapter');
       var Resolver = require('ember/resolver');
 
-      container.register('container-debug-adapter:main', ContainerDebugAdapter);
+      app.register('container-debug-adapter:main', ContainerDebugAdapter);
       app.inject('container-debug-adapter:main', 'namespace', 'application:main');
     }
   });

diff --git a/dist/modules/ember-resolver.js b/dist/modules/ember-resolver.js
@@ -532,11 +532,12 @@ define("ember/container-debug-adapter",
   Ember.Application.initializer({
     name: 'container-debug-adapter',
 
-    initialize: function(container, app) {
+    initialize: function() {
+      var app = arguments[1] || arguments[0];
       var ContainerDebugAdapter = require('ember/container-debug-adapter');
       var Resolver = require('ember/resolver');
 
-      container.register('container-debug-adapter:main', ContainerDebugAdapter);
+      app.register('container-debug-adapter:main', ContainerDebugAdapter);
       app.inject('container-debug-adapter:main', 'namespace', 'application:main');
     }
   });

diff --git a/packages/ember-resolver/lib/initializers.js b/packages/ember-resolver/lib/initializers.js
@@ -4,11 +4,12 @@
   Ember.Application.initializer({
     name: 'container-debug-adapter',
 
-    initialize: function(container, app) {
+    initialize: function() {
+      var app = arguments[1] || arguments[0];
       var ContainerDebugAdapter = require('ember/container-debug-adapter');
       var Resolver = require('ember/resolver');
 
-      container.register('container-debug-adapter:main', ContainerDebugAdapter);
+      app.register('container-debug-adapter:main', ContainerDebugAdapter);
       app.inject('container-debug-adapter:main', 'namespace', 'application:main');
     }
   });