From b847dbd664f35db18a651bf8f0474bb2065bf585 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 14 Mar 2013 17:56:26 +0100 Subject: [PATCH] Reset line numebr on each request --- assets/scripts/app/controllers/build.coffee | 1 + assets/scripts/app/controllers/job.coffee | 1 + assets/scripts/app/routes.coffee | 16 ++++++++-------- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/assets/scripts/app/controllers/build.coffee b/assets/scripts/app/controllers/build.coffee index f2a6b6b1..56740440 100644 --- a/assets/scripts/app/controllers/build.coffee +++ b/assets/scripts/app/controllers/build.coffee @@ -3,6 +3,7 @@ Travis.BuildController = Ember.Controller.extend repoBinding: 'controllers.repo.repo' buildBinding: 'controllers.repo.build' commitBinding: 'build.commit' + lineNumberBinding: 'controllers.repo.lineNumber' currentItemBinding: 'build' diff --git a/assets/scripts/app/controllers/job.coffee b/assets/scripts/app/controllers/job.coffee index fc333355..3f94343c 100644 --- a/assets/scripts/app/controllers/job.coffee +++ b/assets/scripts/app/controllers/job.coffee @@ -4,6 +4,7 @@ Travis.JobController = Em.Controller.extend jobBinding: 'controllers.repo.job' repoBinding: 'controllers.repo.repo' commitBinding: 'job.commit' + lineNumberBinding: 'controllers.repo.lineNumber' currentItemBinding: 'job' diff --git a/assets/scripts/app/routes.coffee b/assets/scripts/app/routes.coffee index 8a151361..4bab2d5b 100644 --- a/assets/scripts/app/routes.coffee +++ b/assets/scripts/app/routes.coffee @@ -58,6 +58,12 @@ Travis.Router.map -> @route 'index', path: '/' @route 'profile', path: '/profile' +Travis.ApplicationRoute = Ember.Route.extend Travis.LineNumberParser, + setupController: -> + @_super.apply this, arguments + + this.controllerFor('repo').set('lineNumber', @fetchLineNumber()) + Travis.IndexCurrentRoute = Ember.Route.extend renderTemplate: -> @render 'repo' @@ -77,7 +83,7 @@ Travis.BuildsRoute = Travis.AbstractBuildsRoute.extend(contentType: 'builds') Travis.PullRequestsRoute = Travis.AbstractBuildsRoute.extend(contentType: 'pull_requests') Travis.BranchesRoute = Travis.AbstractBuildsRoute.extend(contentType: 'branches') -Travis.BuildRoute = Ember.Route.extend Travis.LineNumberParser, +Travis.BuildRoute = Ember.Route.extend renderTemplate: -> @render 'build', outlet: 'pane', into: 'repo' @@ -89,14 +95,11 @@ Travis.BuildRoute = Ember.Route.extend Travis.LineNumberParser, setupController: (controller, model) -> model = Travis.Build.find(model) if model && !model.get - if lineNumber = @fetchLineNumber() - controller.set('lineNumber', lineNumber) - repo = @container.lookup('controller:repo') repo.set('build', model) repo.activate('build') -Travis.JobRoute = Ember.Route.extend Travis.LineNumberParser, +Travis.JobRoute = Ember.Route.extend renderTemplate: -> @render 'job', outlet: 'pane', into: 'repo' @@ -108,9 +111,6 @@ Travis.JobRoute = Ember.Route.extend Travis.LineNumberParser, setupController: (controller, model) -> model = Travis.Job.find(model) if model && !model.get - if lineNumber = @fetchLineNumber() - controller.set('lineNumber', lineNumber) - repo = @container.lookup('controller:repo') repo.set('job', model) repo.activate('job')