Bring back 'outlet pane' and 'outlet pane'

For some reason (I haven't had time to debug it) when we don't use named
outlet rendering "into" does not work in certain circumstances (for
example in index current view, where repos are changed automatically).
This commit is contained in:
Piotr Sarnacki 2013-12-12 15:24:30 +01:00
parent c8575b3f63
commit 8aafb8d4e6
3 changed files with 9 additions and 9 deletions

View File

@ -30,7 +30,7 @@ Ember.Route.reopen
@_super(error) @_super(error)
renderNoOwnedRepos: -> renderNoOwnedRepos: ->
@render('no_owned_repos') @render('no_owned_repos', outlet: 'main')
renderFirstSync: -> renderFirstSync: ->
@renderFirstSync() @renderFirstSync()
@ -132,7 +132,7 @@ Travis.SetupLastBuild = Ember.Mixin.create
repo = @controllerFor('repo').get('repo') repo = @controllerFor('repo').get('repo')
if repo && repo.get('isLoaded') && !repo.get('lastBuildId') if repo && repo.get('isLoaded') && !repo.get('lastBuildId')
Ember.run.next => Ember.run.next =>
@render('builds/not_found', into: 'repo') @render('builds/not_found', into: 'repo', outlet: 'pane')
Travis.GettingStartedRoute = Ember.Route.extend Travis.GettingStartedRoute = Ember.Route.extend
setupController: -> setupController: ->
@ -165,7 +165,7 @@ Travis.FirstSyncRoute = Ember.Route.extend
Travis.IndexCurrentRoute = Ember.Route.extend Travis.SetupLastBuild, Travis.IndexCurrentRoute = Ember.Route.extend Travis.SetupLastBuild,
renderTemplate: -> renderTemplate: ->
@render 'repo' @render 'repo'
@render 'build', into: 'repo' @render 'build', into: 'repo', outlet: 'pane'
setupController: -> setupController: ->
@_super.apply this, arguments @_super.apply this, arguments
@ -182,7 +182,7 @@ Travis.IndexCurrentRoute = Ember.Route.extend Travis.SetupLastBuild,
Travis.AbstractBuildsRoute = Ember.Route.extend Travis.AbstractBuildsRoute = Ember.Route.extend
renderTemplate: -> renderTemplate: ->
@render 'builds', into: 'repo' @render 'builds', into: 'repo', outlet: 'pane'
setupController: -> setupController: ->
@controllerFor('repo').activate(@get('contentType')) @controllerFor('repo').activate(@get('contentType'))
@ -207,7 +207,7 @@ Travis.BranchesRoute = Travis.AbstractBuildsRoute.extend(contentType: 'branches'
Travis.BuildRoute = Ember.Route.extend Travis.BuildRoute = Ember.Route.extend
renderTemplate: -> renderTemplate: ->
@render 'build', into: 'repo' @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
@ -228,7 +228,7 @@ Travis.BuildRoute = Ember.Route.extend
Travis.JobRoute = Ember.Route.extend Travis.JobRoute = Ember.Route.extend
renderTemplate: -> renderTemplate: ->
@render 'job', into: 'repo' @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
@ -255,7 +255,7 @@ Travis.RepoIndexRoute = Ember.Route.extend Travis.SetupLastBuild,
@controllerFor('repo').activate('current') @controllerFor('repo').activate('current')
renderTemplate: -> renderTemplate: ->
@render 'build', into: 'repo' @render 'build', into: 'repo', outlet: 'pane'
Travis.RepoRoute = Ember.Route.extend Travis.RepoRoute = Ember.Route.extend
renderTemplate: -> renderTemplate: ->

View File

@ -8,7 +8,7 @@
<div id="main"> <div id="main">
{{outlet flash}} {{outlet flash}}
{{outlet}} {{outlet main}}
</div> </div>
<div id="right"> <div id="right">

View File

@ -17,7 +17,7 @@
{{/with}} {{/with}}
<div class="tab"> <div class="tab">
{{outlet}} {{outlet pane}}
</div> </div>
{{else}} {{else}}
<div class="loading"><span>Loading</span></div> <div class="loading"><span>Loading</span></div>