Don't specify outlet name for 'pane' outlets
Specyfing "pane" as an outlet name here was a legacy thing. In current form it doesn't give us anything and results in more code, as we need to specify outlet everytime we want to render something there.
This commit is contained in:
parent
de14a03de1
commit
42becfc019
|
@ -83,9 +83,6 @@ Travis.Router.map ->
|
||||||
@route 'notFound', path: "/*path"
|
@route 'notFound', path: "/*path"
|
||||||
|
|
||||||
Travis.RequestsRoute = Travis.Route.extend
|
Travis.RequestsRoute = Travis.Route.extend
|
||||||
renderTemplate: ->
|
|
||||||
@render 'requests', into: 'repo', outlet: 'pane'
|
|
||||||
|
|
||||||
setupController: ->
|
setupController: ->
|
||||||
@_super.apply this, arguments
|
@_super.apply this, arguments
|
||||||
@controllerFor('repo').activate('requests')
|
@controllerFor('repo').activate('requests')
|
||||||
|
@ -94,9 +91,6 @@ Travis.RequestsRoute = Travis.Route.extend
|
||||||
Travis.Request.fetch repository_id: @modelFor('repo').get('id')
|
Travis.Request.fetch repository_id: @modelFor('repo').get('id')
|
||||||
|
|
||||||
Travis.RequestRoute = Travis.Route.extend
|
Travis.RequestRoute = Travis.Route.extend
|
||||||
renderTemplate: ->
|
|
||||||
@render 'request', into: 'repo', outlet: 'pane'
|
|
||||||
|
|
||||||
setupController: ->
|
setupController: ->
|
||||||
@_super.apply this, arguments
|
@_super.apply this, arguments
|
||||||
@controllerFor('repo').activate('request')
|
@controllerFor('repo').activate('request')
|
||||||
|
@ -133,7 +127,7 @@ Travis.InsufficientOauthPermissionsRoute = Travis.SimpleLayoutRoute.extend
|
||||||
Travis.IndexCurrentRoute = Travis.Route.extend
|
Travis.IndexCurrentRoute = Travis.Route.extend
|
||||||
renderTemplate: ->
|
renderTemplate: ->
|
||||||
@render 'repo'
|
@render 'repo'
|
||||||
@render 'build', into: 'repo', outlet: 'pane'
|
@render 'build', into: 'repo'
|
||||||
|
|
||||||
setupController: ->
|
setupController: ->
|
||||||
@_super.apply this, arguments
|
@_super.apply this, arguments
|
||||||
|
@ -157,7 +151,7 @@ Travis.IndexCurrentRoute = Travis.Route.extend
|
||||||
|
|
||||||
Travis.AbstractBuildsRoute = Travis.Route.extend
|
Travis.AbstractBuildsRoute = Travis.Route.extend
|
||||||
renderTemplate: ->
|
renderTemplate: ->
|
||||||
@render 'builds', into: 'repo', outlet: 'pane'
|
@render 'builds'
|
||||||
|
|
||||||
setupController: ->
|
setupController: ->
|
||||||
@controllerFor('repo').activate(@get('contentType'))
|
@controllerFor('repo').activate(@get('contentType'))
|
||||||
|
@ -181,9 +175,6 @@ Travis.PullRequestsRoute = Travis.AbstractBuildsRoute.extend(contentType: 'pull_
|
||||||
Travis.BranchesRoute = Travis.AbstractBuildsRoute.extend(contentType: 'branches')
|
Travis.BranchesRoute = Travis.AbstractBuildsRoute.extend(contentType: 'branches')
|
||||||
|
|
||||||
Travis.BuildRoute = Travis.Route.extend
|
Travis.BuildRoute = Travis.Route.extend
|
||||||
renderTemplate: ->
|
|
||||||
@render 'build', into: 'repo', outlet: 'pane'
|
|
||||||
|
|
||||||
serialize: (model, params) ->
|
serialize: (model, params) ->
|
||||||
id = if model.get then model.get('id') else model
|
id = if model.get then model.get('id') else model
|
||||||
|
|
||||||
|
@ -202,9 +193,6 @@ Travis.BuildRoute = Travis.Route.extend
|
||||||
Travis.Build.fetch(params.build_id)
|
Travis.Build.fetch(params.build_id)
|
||||||
|
|
||||||
Travis.JobRoute = Travis.Route.extend
|
Travis.JobRoute = Travis.Route.extend
|
||||||
renderTemplate: ->
|
|
||||||
@render 'job', into: 'repo', outlet: 'pane'
|
|
||||||
|
|
||||||
serialize: (model, params) ->
|
serialize: (model, params) ->
|
||||||
id = if model.get then model.get('id') else model
|
id = if model.get then model.get('id') else model
|
||||||
|
|
||||||
|
@ -231,9 +219,9 @@ Travis.RepoIndexRoute = Travis.Route.extend
|
||||||
|
|
||||||
renderTemplate: ->
|
renderTemplate: ->
|
||||||
if @modelFor('repo').get('lastBuildId')
|
if @modelFor('repo').get('lastBuildId')
|
||||||
@render 'build', into: 'repo', outlet: 'pane'
|
@render 'build'
|
||||||
else
|
else
|
||||||
@render('builds/not_found', into: 'repo', outlet: 'pane')
|
@render 'builds/not_found'
|
||||||
|
|
||||||
Travis.RepoRoute = Travis.Route.extend
|
Travis.RepoRoute = Travis.Route.extend
|
||||||
renderTemplate: ->
|
renderTemplate: ->
|
||||||
|
@ -311,7 +299,7 @@ Travis.ProfileIndexRoute = Travis.Route.extend
|
||||||
@container.lookup('controller:profile').activate 'hooks'
|
@container.lookup('controller:profile').activate 'hooks'
|
||||||
|
|
||||||
renderTemplate: ->
|
renderTemplate: ->
|
||||||
@render 'hooks', outlet: 'pane', into: 'profile', controller: 'profile'
|
@render 'hooks', controller: 'profile'
|
||||||
|
|
||||||
Travis.AccountRoute = Travis.Route.extend
|
Travis.AccountRoute = Travis.Route.extend
|
||||||
setupController: (controller, account) ->
|
setupController: (controller, account) ->
|
||||||
|
@ -351,14 +339,14 @@ Travis.AccountIndexRoute = Travis.Route.extend
|
||||||
@container.lookup('controller:profile').activate 'hooks'
|
@container.lookup('controller:profile').activate 'hooks'
|
||||||
|
|
||||||
renderTemplate: ->
|
renderTemplate: ->
|
||||||
@render 'hooks', outlet: 'pane', into: 'profile'
|
@render 'hooks'
|
||||||
|
|
||||||
Travis.AccountProfileRoute = Travis.Route.extend
|
Travis.AccountProfileRoute = Travis.Route.extend
|
||||||
setupController: ->
|
setupController: ->
|
||||||
@container.lookup('controller:profile').activate 'user'
|
@container.lookup('controller:profile').activate 'user'
|
||||||
|
|
||||||
renderTemplate: ->
|
renderTemplate: ->
|
||||||
@render 'user', outlet: 'pane', into: 'profile'
|
@render 'user'
|
||||||
|
|
||||||
Travis.AuthRoute = Travis.Route.extend
|
Travis.AuthRoute = Travis.Route.extend
|
||||||
renderTemplate: ->
|
renderTemplate: ->
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
{{view Travis.ProfileTabsView}}
|
{{view Travis.ProfileTabsView}}
|
||||||
|
|
||||||
<div class="tab">
|
<div class="tab">
|
||||||
{{outlet pane}}
|
{{outlet}}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
{{/with}}
|
{{/with}}
|
||||||
|
|
||||||
<div class="tab">
|
<div class="tab">
|
||||||
{{outlet pane}}
|
{{outlet}}
|
||||||
</div>
|
</div>
|
||||||
{{else}}
|
{{else}}
|
||||||
<div class="loading"><span>Loading</span></div>
|
<div class="loading"><span>Loading</span></div>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user