From ee7c274ba73093baf54572fbe1aba944c6c710f4 Mon Sep 17 00:00:00 2001 From: Jason Williams Date: Mon, 23 Jun 2014 18:35:39 +0000 Subject: [PATCH] Switch Ember initializers to public API methods --- core/client/initializers/csrf-token.js | 10 +++++----- core/client/initializers/csrf.js | 8 ++++---- core/client/initializers/current-user.js | 6 +++--- core/client/initializers/ghost-paths.js | 10 +++++----- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/core/client/initializers/csrf-token.js b/core/client/initializers/csrf-token.js index e3ffd74b79..ba4a27cb33 100644 --- a/core/client/initializers/csrf-token.js +++ b/core/client/initializers/csrf-token.js @@ -1,12 +1,12 @@ var CSRFTokenInitializer = { name: 'csrf-token', - initialize: function (container) { - container.register('csrf:token', $('meta[name="csrf-param"]').attr('content'), { instantiate: false }); + initialize: function (container, application) { + application.register('csrf:token', $('meta[name="csrf-param"]').attr('content'), { instantiate: false }); - container.injection('route', 'csrf', 'csrf:token'); - container.injection('model', 'csrf', 'csrf:token'); - container.injection('controller', 'csrf', 'csrf:token'); + application.inject('route', 'csrf', 'csrf:token'); + application.inject('model', 'csrf', 'csrf:token'); + application.inject('controller', 'csrf', 'csrf:token'); } }; diff --git a/core/client/initializers/csrf.js b/core/client/initializers/csrf.js index 43c86ecd37..c219238e5a 100644 --- a/core/client/initializers/csrf.js +++ b/core/client/initializers/csrf.js @@ -1,11 +1,11 @@ var CSRFInitializer = { name: 'csrf', - initialize: function (container) { - container.register('csrf:current', $('meta[name="csrf-param"]').attr('content'), { instantiate: false }); + initialize: function (container, application) { + application.register('csrf:current', $('meta[name="csrf-param"]').attr('content'), { instantiate: false }); - container.injection('route', 'csrf', 'csrf:current'); - container.injection('controller', 'csrf', 'csrf:current'); + application.inject('route', 'csrf', 'csrf:current'); + application.inject('controller', 'csrf', 'csrf:current'); } }; diff --git a/core/client/initializers/current-user.js b/core/client/initializers/current-user.js index c8cbc6a0b4..3c7045b117 100644 --- a/core/client/initializers/current-user.js +++ b/core/client/initializers/current-user.js @@ -22,11 +22,11 @@ var currentUserInitializer = { // Find the user (which should be fast since we just preloaded it in the store) store.find('user', preloadedUser.id).then(function (user) { // Register the value for injection - container.register('user:current', user, { instantiate: false }); + application.register('user:current', user, { instantiate: false }); // Inject into the routes and controllers as the user property. - container.injection('route', 'user', 'user:current'); - container.injection('controller', 'user', 'user:current'); + application.inject('route', 'user', 'user:current'); + application.inject('controller', 'user', 'user:current'); application.advanceReadiness(); }); diff --git a/core/client/initializers/ghost-paths.js b/core/client/initializers/ghost-paths.js index de0aae5467..e69a0efa5b 100644 --- a/core/client/initializers/ghost-paths.js +++ b/core/client/initializers/ghost-paths.js @@ -4,12 +4,12 @@ var ghostPathsInitializer = { name: 'ghost-paths', after: 'store', - initialize: function (container) { - container.register('ghost:paths', ghostPaths(), {instantiate: false}); + initialize: function (container, application) { + application.register('ghost:paths', ghostPaths(), { instantiate: false }); - container.injection('route', 'ghostPaths', 'ghost:paths'); - container.injection('model', 'ghostPaths', 'ghost:paths'); - container.injection('controller', 'ghostPaths', 'ghost:paths'); + application.inject('route', 'ghostPaths', 'ghost:paths'); + application.inject('model', 'ghostPaths', 'ghost:paths'); + application.inject('controller', 'ghostPaths', 'ghost:paths'); } };