From 86aaead1ce90594f4d1bfcf6cf5872d2b30da003 Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Sat, 25 Jun 2016 10:39:50 -0700 Subject: [PATCH] Update application.js --- app/app/routes/application.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/app/routes/application.js b/app/app/routes/application.js index bdc1c112..872ca6e5 100644 --- a/app/app/routes/application.js +++ b/app/app/routes/application.js @@ -12,9 +12,15 @@ import Ember from 'ember'; import netUtil from '../utils/net'; +const { + inject: { service } +} = Ember; + export default Ember.Route.extend({ - userService: Ember.inject.service('user'), - sessionService: Ember.inject.service('session'), + userService: service('user'), + sessionService: service('session'), + appMeta: service(), + transitioning: false, beforeModel: function(transition) { @@ -22,7 +28,7 @@ export default Ember.Route.extend({ let session = this.get('sessionService'); // Session ready? - return session.boot().then(function() { + return this.get('appMeta').boot().then(function() { // Need to authenticate? if (!session.get("appMeta.allowAnonymousAccess") && !session.get("authenticated") && is.not.startWith(transition.targetName, 'auth.')) {