From 90eb4f9517c5b69bc4847062b2b00e70affdd7ae Mon Sep 17 00:00:00 2001 From: Harvey Kandola Date: Wed, 22 Mar 2017 11:34:49 +0000 Subject: [PATCH] cosmetics --- app/app/routes/application.js | 5 +++-- app/app/services/session.js | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/app/routes/application.js b/app/app/routes/application.js index b75e652f..c772a1c1 100644 --- a/app/app/routes/application.js +++ b/app/app/routes/application.js @@ -24,6 +24,8 @@ export default Ember.Route.extend(ApplicationRouteMixin, TooltipMixin, { pinned: service(), beforeModel(transition) { + this._super(...arguments); + return this.get('appMeta').boot(transition.targetName).then(data => { if (this.get('session.session.authenticator') !== "authenticator:documize" && this.get('session.session.authenticator') !== "authenticator:keycloak" && @@ -52,8 +54,7 @@ export default Ember.Route.extend(ApplicationRouteMixin, TooltipMixin, { } } - // Return true to bubble this event to any parent route. - return true; + return true; // bubble this event to any parent route } } }); diff --git a/app/app/services/session.js b/app/app/services/session.js index 7fdad147..7c848507 100644 --- a/app/app/services/session.js +++ b/app/app/services/session.js @@ -42,7 +42,7 @@ export default SimpleAuthSession.extend({ return data.get('global'); }), - init: function () { + init() { this._super(...arguments); this.set('isMac', is.mac());