1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-08-09 15:35:27 +02:00

Merge branch 'master' into github-extension

This commit is contained in:
Elliott Stoneham 2016-07-07 19:59:39 +01:00
commit f8b5f8b59e
2 changed files with 4 additions and 4 deletions

View file

@ -7,7 +7,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
session: Ember.inject.service(), session: Ember.inject.service(),
beforeModel: function () { beforeModel: function () {
if (!this.get("session").authenticated) { if (!this.get("session.authenticated")) {
this.transitionTo('auth.login'); this.transitionTo('auth.login');
} }
}, },

View file

@ -45,7 +45,7 @@ export default Ember.Route.extend(ApplicationRouteMixin, {
return true; return true;
}, },
error(error, transition) { // jshint ignore: line error(error /*, transition*/ ) {
if (error) { if (error) {
if (netUtil.isAjaxAccessError(error)) { if (netUtil.isAjaxAccessError(error)) {
localStorage.clear(); localStorage.clear();
@ -56,5 +56,5 @@ export default Ember.Route.extend(ApplicationRouteMixin, {
// Return true to bubble this event to any parent route. // Return true to bubble this event to any parent route.
return true; return true;
} }
}, }
}); });