From d8b96a960d59e16e6d8141fb07754d7281c557af Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 16 May 2013 13:14:40 +0200 Subject: [PATCH] Always send afterSignIn event --- assets/scripts/app/auth.coffee | 6 ++++-- assets/scripts/travis.coffee | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/assets/scripts/app/auth.coffee b/assets/scripts/app/auth.coffee index d13b074a..38232ddb 100644 --- a/assets/scripts/app/auth.coffee +++ b/assets/scripts/app/auth.coffee @@ -67,8 +67,10 @@ @set('state', 'signed-in') Travis.setLocale(data.user.locale || Travis.default_locale) Travis.trigger('user:signed_in', data.user) - if path = @readAfterSignInPath() - Travis.__container__.lookup('router:main').send('afterSignIn', path) + if router = Travis.__container__.lookup('router:main') + path = @readAfterSignInPath() + Ember.run.next -> + router.send('afterSignIn', path) storeData: (data, storage) -> storage.setItem('travis.token', data.token) diff --git a/assets/scripts/travis.coffee b/assets/scripts/travis.coffee index 1f1dbbcd..93e487ae 100644 --- a/assets/scripts/travis.coffee +++ b/assets/scripts/travis.coffee @@ -81,12 +81,12 @@ setupGoogleAnalytics() if Travis.config.ga_code require 'ext/i18n' require 'travis/ajax' +require 'routes' require 'auth' require 'controllers' require 'helpers' require 'models' require 'pusher' -require 'routes' require 'slider' require 'store' require 'tailing'