From 8aafb8d4e6c1a9be8c1f6d781ef19de63dd2198e Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Thu, 12 Dec 2013 15:24:30 +0100
Subject: [PATCH] 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).
---
 assets/scripts/app/routes.coffee                 | 14 +++++++-------
 assets/scripts/app/templates/layouts/profile.hbs |  2 +-
 assets/scripts/app/templates/repos/show.hbs      |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/assets/scripts/app/routes.coffee b/assets/scripts/app/routes.coffee
index fedc4127..06a20676 100644
--- a/assets/scripts/app/routes.coffee
+++ b/assets/scripts/app/routes.coffee
@@ -30,7 +30,7 @@ Ember.Route.reopen
         @_super(error)
 
     renderNoOwnedRepos: ->
-      @render('no_owned_repos')
+      @render('no_owned_repos', outlet: 'main')
 
     renderFirstSync: ->
       @renderFirstSync()
@@ -132,7 +132,7 @@ Travis.SetupLastBuild = Ember.Mixin.create
     repo = @controllerFor('repo').get('repo')
     if repo && repo.get('isLoaded') && !repo.get('lastBuildId')
       Ember.run.next =>
-        @render('builds/not_found', into: 'repo')
+        @render('builds/not_found', into: 'repo', outlet: 'pane')
 
 Travis.GettingStartedRoute = Ember.Route.extend
   setupController: ->
@@ -165,7 +165,7 @@ Travis.FirstSyncRoute = Ember.Route.extend
 Travis.IndexCurrentRoute = Ember.Route.extend Travis.SetupLastBuild,
   renderTemplate: ->
     @render 'repo'
-    @render 'build', into: 'repo'
+    @render 'build', into: 'repo', outlet: 'pane'
 
   setupController: ->
     @_super.apply this, arguments
@@ -182,7 +182,7 @@ Travis.IndexCurrentRoute = Ember.Route.extend Travis.SetupLastBuild,
 
 Travis.AbstractBuildsRoute = Ember.Route.extend
   renderTemplate: ->
-    @render 'builds', into: 'repo'
+    @render 'builds', into: 'repo', outlet: 'pane'
 
   setupController: ->
     @controllerFor('repo').activate(@get('contentType'))
@@ -207,7 +207,7 @@ Travis.BranchesRoute = Travis.AbstractBuildsRoute.extend(contentType: 'branches'
 
 Travis.BuildRoute = Ember.Route.extend
   renderTemplate: ->
-    @render 'build', into: 'repo'
+    @render 'build', into: 'repo', outlet: 'pane'
 
   serialize: (model, params) ->
     id = if model.get then model.get('id') else model
@@ -228,7 +228,7 @@ Travis.BuildRoute = Ember.Route.extend
 
 Travis.JobRoute = Ember.Route.extend
   renderTemplate: ->
-    @render 'job', into: 'repo'
+    @render 'job', into: 'repo', outlet: 'pane'
 
   serialize: (model, params) ->
     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')
 
   renderTemplate: ->
-    @render 'build', into: 'repo'
+    @render 'build', into: 'repo', outlet: 'pane'
 
 Travis.RepoRoute = Ember.Route.extend
   renderTemplate: ->
diff --git a/assets/scripts/app/templates/layouts/profile.hbs b/assets/scripts/app/templates/layouts/profile.hbs
index e149cc94..6ce4e370 100644
--- a/assets/scripts/app/templates/layouts/profile.hbs
+++ b/assets/scripts/app/templates/layouts/profile.hbs
@@ -8,7 +8,7 @@
 
 <div id="main">
   {{outlet flash}}
-  {{outlet}}
+  {{outlet main}}
 </div>
 
 <div id="right">
diff --git a/assets/scripts/app/templates/repos/show.hbs b/assets/scripts/app/templates/repos/show.hbs
index 07e62096..3b804bba 100644
--- a/assets/scripts/app/templates/repos/show.hbs
+++ b/assets/scripts/app/templates/repos/show.hbs
@@ -17,7 +17,7 @@
       {{/with}}
 
       <div class="tab">
-        {{outlet}}
+        {{outlet pane}}
       </div>
     {{else}}
       <div class="loading"><span>Loading</span></div>