From 9ed3598f9563a6018c5a410c91485e82e860eab1 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Tue, 19 Feb 2013 22:37:26 +0100 Subject: [PATCH] Implement branches --- assets/scripts/app/controllers/repo.coffee | 3 ++- assets/scripts/app/routes.coffee | 14 ++++++------- .../scripts/app/templates/repos/show/tabs.hbs | 20 +++++++++---------- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/assets/scripts/app/controllers/repo.coffee b/assets/scripts/app/controllers/repo.coffee index 176fdf1b..7eefe255 100644 --- a/assets/scripts/app/controllers/repo.coffee +++ b/assets/scripts/app/controllers/repo.coffee @@ -66,6 +66,8 @@ Travis.RepoController = Travis.Controller.extend @connectTab('job') connectTab: (tab) -> + # TODO: such implementation seems weird now, because we render + # in the renderTemplate function in routes name = if tab == 'current' then 'build' else tab viewClass = if name in ['builds', 'branches', 'pull_requests'] Travis.BuildsView @@ -73,7 +75,6 @@ Travis.RepoController = Travis.Controller.extend Travis["#{$.camelize(name)}View"] @set('tab', tab) - #@connectOutlet(outletName: 'pane', controller: this, viewClass: viewClass) _bind: (to, from) -> @bindings.push Ember.oneWay(this, to, from) diff --git a/assets/scripts/app/routes.coffee b/assets/scripts/app/routes.coffee index a26eebff..fef65110 100644 --- a/assets/scripts/app/routes.coffee +++ b/assets/scripts/app/routes.coffee @@ -385,6 +385,7 @@ Travis.Router.map -> @resource 'job', path: '/jobs/:job_id' @resource 'builds', path: '/builds' @resource 'pullRequests', path: '/pull_requests' + @resource 'branches', path: '/branches' Travis.IndexCurrentRoute = Ember.Route.extend renderTemplate: -> @@ -393,19 +394,16 @@ Travis.IndexCurrentRoute = Ember.Route.extend setupController: -> @container.lookup('controller:repo').activate('index') -Travis.BuildsRoute = Ember.Route.extend +Travis.AbstractBuidsRoute = Ember.Route.extend renderTemplate: -> @render 'builds', outlet: 'pane', into: 'repo' setupController: -> - @container.lookup('controller:repo').activate('builds') + @container.lookup('controller:repo').activate(@get('contentType')) -Travis.PullRequestsRoute = Ember.Route.extend - renderTemplate: -> - @render 'builds', outlet: 'pane', into: 'repo' - - setupController: -> - @container.lookup('controller:repo').activate('pull_requests') +Travis.BuildsRoute = Travis.AbstractBuidsRoute.extend(contentType: 'builds') +Travis.PullRequestsRoute = Travis.AbstractBuidsRoute.extend(contentType: 'pull_requests') +Travis.BranchesRoute = Travis.AbstractBuidsRoute.extend(contentType: 'branches') Travis.BuildRoute = Ember.Route.extend renderTemplate: -> diff --git a/assets/scripts/app/templates/repos/show/tabs.hbs b/assets/scripts/app/templates/repos/show/tabs.hbs index 9e47a4f2..6b630ae9 100644 --- a/assets/scripts/app/templates/repos/show/tabs.hbs +++ b/assets/scripts/app/templates/repos/show/tabs.hbs @@ -28,20 +28,20 @@
  • - {{#if view.repo.slug}} - - {{t repositories.tabs.branches}} - + {{#if slug}} + {{#linkTo "branches" this}} + {{t repositories.tabs.branches}} + {{/linkTo}} {{/if}}
  • {{#with view.build}} - {{#if id}} - + {{#if repo.slug}} + {{#linkTo "build" repo this}} {{t repositories.tabs.build}} #{{number}} - + {{/linkTo}} {{/if}} {{/with}}
    @@ -49,10 +49,10 @@
  • {{#with view.job}} - {{#if id}} - + {{#if repo.slug}} + {{#linkTo "job" repo this}} {{t repositories.tabs.job}} #{{number}} - + {{/linkTo}} {{/if}} {{/with}}