Update ember and get initialState back

This commit is contained in:
Piotr Sarnacki 2012-09-26 22:04:11 +02:00
parent 493cdae009
commit ccb4e27bdc
5 changed files with 6919 additions and 61 deletions

View File

@ -21,6 +21,7 @@ require 'data/sponsors'
Travis.reopen Travis.reopen
App: Em.Application.extend App: Em.Application.extend
autoinit: false
currentUserBinding: 'auth.user' currentUserBinding: 'auth.user'
accessTokenBinding: 'auth.user.accessToken' accessTokenBinding: 'auth.user.accessToken'
authStateBinding: 'auth.state' authStateBinding: 'auth.state'

View File

@ -68,6 +68,7 @@ Travis.Router = Ember.Router.extend
router.get('statsLayoutController').connectOutlet 'main', 'stats' router.get('statsLayoutController').connectOutlet 'main', 'stats'
profile: Ember.Route.extend profile: Ember.Route.extend
initialState: 'index'
route: '/profile' route: '/profile'
connectOutlets: (router) -> connectOutlets: (router) ->
router.get('applicationController').connectOutlet 'profileLayout' router.get('applicationController').connectOutlet 'profileLayout'
@ -82,6 +83,7 @@ Travis.Router = Ember.Router.extend
router.get('profileController').activate 'hooks' router.get('profileController').activate 'hooks'
account: Ember.Route.extend account: Ember.Route.extend
initialState: 'index'
route: '/:login' route: '/:login'
connectOutlets: (router, account) -> connectOutlets: (router, account) ->
@ -112,6 +114,7 @@ Travis.Router = Ember.Router.extend
router.get('profileController').activate 'user' router.get('profileController').activate 'user'
home: Ember.Route.extend home: Ember.Route.extend
initialState: 'show'
route: '/' route: '/'
connectOutlets: (router) -> connectOutlets: (router) ->
router.get('applicationController').connectOutlet 'home' router.get('applicationController').connectOutlet 'home'
@ -127,6 +130,7 @@ Travis.Router = Ember.Router.extend
router.get('repositoryController').activate('index') router.get('repositoryController').activate('index')
repository: Ember.Route.extend repository: Ember.Route.extend
initialState: 'show'
route: '/:owner/:name' route: '/:owner/:name'
connectOutlets: (router, repository) -> connectOutlets: (router, repository) ->
@ -164,6 +168,7 @@ Travis.Router = Ember.Router.extend
builds: Ember.Route.extend builds: Ember.Route.extend
route: '/builds' route: '/builds'
initialState: 'index'
index: Ember.Route.extend index: Ember.Route.extend
route: '/' route: '/'

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff