diff --git a/assets/scripts/app/routes.coffee b/assets/scripts/app/routes.coffee index bf7b0ad7..85a06039 100644 --- a/assets/scripts/app/routes.coffee +++ b/assets/scripts/app/routes.coffee @@ -148,12 +148,6 @@ Travis.Router = Ember.Router.extend needsAuth: (path) -> path.indexOf('/profile') == 0 - afterSignIn: -> - path = sessionStorage.getItem('travis.after_signin_path') - sessionStorage.removeItem('travis.after_signin_path') - @transitionTo('root') - @route(path || '/') - afterSignOut: -> @authorize('/') @@ -174,6 +168,7 @@ Travis.Router = Ember.Router.extend root: Ember.Route.extend route: '/' loading: Ember.State.extend() + afterSignIn: (-> ) auth: Ember.Route.extend route: '/auth' @@ -183,9 +178,14 @@ Travis.Router = Ember.Router.extend router.get('authLayoutController').connectOutlet('top', 'top') router.get('authLayoutController').connectOutlet('main', 'signin') + afterSignIn: (router) -> + path = sessionStorage.getItem('travis.after_signin_path') + sessionStorage.removeItem('travis.after_signin_path') + router.transitionTo('root') + router.route(path || '/') + stats: Ember.Route.extend route: '/stats' - afterSignIn: (-> ) connectOutlets: (router) -> router.get('applicationController').connectOutlet 'statsLayout' $('body').attr('id', 'stats') @@ -194,7 +194,6 @@ Travis.Router = Ember.Router.extend profile: Ember.Route.extend initialState: 'index' - afterSignIn: (-> ) route: '/profile' connectOutlets: (router) -> @@ -261,7 +260,6 @@ Travis.Router = Ember.Router.extend home: Ember.Route.extend route: '/' - afterSignIn: (-> ) connectOutlets: (router) -> router.get('applicationController').connectOutlet 'homeLayout' $('body').attr('id', 'home') diff --git a/assets/scripts/app/templates/auth/signin.hbs b/assets/scripts/app/templates/auth/signin.hbs index 17b32579..a5609048 100644 --- a/assets/scripts/app/templates/auth/signin.hbs +++ b/assets/scripts/app/templates/auth/signin.hbs @@ -9,5 +9,3 @@ Please sign in with GitHub.

{{/if}} - - diff --git a/assets/styles/auth.sass b/assets/styles/auth.sass index ccec8f42..8935ad4e 100644 --- a/assets/styles/auth.sass +++ b/assets/styles/auth.sass @@ -3,6 +3,7 @@ #auth #page display: block + min-height: 500px #main top: 200px diff --git a/public/scripts/app.js b/public/scripts/app.js index cba2f34b..32a1a15e 100644 --- a/public/scripts/app.js +++ b/public/scripts/app.js @@ -29619,4 +29619,4 @@ var _require=function(){function c(a,c){document.addEventListener?a.addEventList ++g&&setTimeout(c,0)})}}(); (function(){!window.WebSocket&&window.MozWebSocket&&(window.WebSocket=window.MozWebSocket);if(window.WebSocket)Pusher.Transport=window.WebSocket,Pusher.TransportType="native";var c=(document.location.protocol=="http:"?Pusher.cdn_http:Pusher.cdn_https)+Pusher.VERSION,a=[];window.JSON||a.push(c+"/json2"+Pusher.dependency_suffix+".js");if(!window.WebSocket)window.WEB_SOCKET_DISABLE_AUTO_INITIALIZATION=!0,a.push(c+"/flashfallback"+Pusher.dependency_suffix+".js");var b=function(){return window.WebSocket?function(){Pusher.ready()}: function(){window.WebSocket?(Pusher.Transport=window.WebSocket,Pusher.TransportType="flash",window.WEB_SOCKET_SWF_LOCATION=c+"/WebSocketMain.swf",WebSocket.__addTask(function(){Pusher.ready()}),WebSocket.__initialize()):(Pusher.Transport=null,Pusher.TransportType="none",Pusher.ready())}}(),e=function(a){var b=function(){document.body?a():setTimeout(b,0)};b()},g=function(){e(b)};a.length>0?_require(a,g):g()})(); -;minispade.register('app', "(function() {(function() {\nminispade.require('auth');\nminispade.require('controllers');\nminispade.require('helpers');\nminispade.require('models');\nminispade.require('pusher');\nminispade.require('routes');\nminispade.require('slider');\nminispade.require('store');\nminispade.require('tailing');\nminispade.require('templates');\nminispade.require('views');\nminispade.require('config/locales');\nminispade.require('data/sponsors');\n\n Travis.reopen({\n App: Em.Application.extend({\n autoinit: false,\n currentUserBinding: 'auth.user',\n authStateBinding: 'auth.state',\n init: function() {\n this._super.apply(this, arguments);\n this.store = Travis.Store.create();\n this.store.loadMany(Travis.Sponsor, Travis.SPONSORS);\n this.set('auth', Travis.Auth.create({\n app: this,\n endpoint: Travis.config.api_endpoint\n }));\n this.slider = new Travis.Slider();\n this.pusher = new Travis.Pusher(Travis.config.pusher_key);\n return this.tailing = new Travis.Tailing();\n },\n signIn: function() {\n return this.get('auth').signIn();\n },\n autoSignIn: function() {\n return this.get('auth').autoSignIn();\n },\n signOut: function() {\n this.get('auth').signOut();\n return this.get('router').send('afterSignOut');\n },\n receive: function() {\n return this.store.receive.apply(this.store, arguments);\n },\n toggleSidebar: function() {\n var element;\n $('body').toggleClass('maximized');\n element = $('');\n $('#top .profile').append(element);\n Em.run.later((function() {\n return element.remove();\n }), 10);\n element = $('');\n $('#repo').append(element);\n return Em.run.later((function() {\n return element.remove();\n }), 10);\n }\n })\n });\n\n}).call(this);\n\n})();\n//@ sourceURL=app");minispade.register('auth', "(function() {(function() {\n\n this.Travis.Auth = Ember.Object.extend({\n iframe: $('