Skip to content

Commit

Permalink
Switch Ember initializers to public API methods
Browse files Browse the repository at this point in the history
  • Loading branch information
jaswilli committed Jun 23, 2014
1 parent d135930 commit ee7c274
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
10 changes: 5 additions & 5 deletions core/client/initializers/csrf-token.js
Original file line number Diff line number Diff line change
@@ -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');
}
};

Expand Down
8 changes: 4 additions & 4 deletions core/client/initializers/csrf.js
Original file line number Diff line number Diff line change
@@ -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');
}
};

Expand Down
6 changes: 3 additions & 3 deletions core/client/initializers/current-user.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});
Expand Down
10 changes: 5 additions & 5 deletions core/client/initializers/ghost-paths.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
};

Expand Down

0 comments on commit ee7c274

Please sign in to comment.