From 79f1dc448fc0cd35a1143a65dafc373df56dd423 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 14 Mar 2013 10:07:35 +0100 Subject: [PATCH] Revert "move log subscrition to a log controller" This was causing the log to not refresh sometimes when switching from one repo to another, I'm reverting for now, we will have to have another look. This reverts commit 2e8b74160cf55aa5644997511c9a8fc3f767dd0c. Conflicts: assets/scripts/app/controllers/build.coffee assets/scripts/app/models/build.coffee assets/scripts/app/templates/builds/show.hbs assets/scripts/app/views/log.coffee assets/scripts/vendor/log.js --- assets/scripts/app/controllers.coffee | 1 - assets/scripts/app/controllers/build.coffee | 7 +------ assets/scripts/app/controllers/job.coffee | 6 +----- assets/scripts/app/controllers/log.coffee | 15 --------------- assets/scripts/app/models/build.coffee | 4 ---- assets/scripts/app/routes.coffee | 1 - assets/scripts/app/templates/builds/show.hbs | 2 +- assets/scripts/app/views/build.coffee | 1 - assets/scripts/app/views/log.coffee | 5 ++++- 9 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 assets/scripts/app/controllers/log.coffee diff --git a/assets/scripts/app/controllers.coffee b/assets/scripts/app/controllers.coffee index e7e7288b..475e997d 100644 --- a/assets/scripts/app/controllers.coffee +++ b/assets/scripts/app/controllers.coffee @@ -29,7 +29,6 @@ require 'controllers/builds' require 'controllers/flash' require 'controllers/home' require 'controllers/job' -require 'controllers/log' require 'controllers/profile' require 'controllers/repos' require 'controllers/repo' diff --git a/assets/scripts/app/controllers/build.coffee b/assets/scripts/app/controllers/build.coffee index 751565f1..f2a6b6b1 100644 --- a/assets/scripts/app/controllers/build.coffee +++ b/assets/scripts/app/controllers/build.coffee @@ -1,9 +1,8 @@ Travis.BuildController = Ember.Controller.extend - needs: ['repo', 'log'] + needs: ['repo'] repoBinding: 'controllers.repo.repo' buildBinding: 'controllers.repo.build' commitBinding: 'build.commit' - jobBinding: 'controllers.log.job' currentItemBinding: 'build' @@ -22,7 +21,3 @@ Travis.BuildController = Ember.Controller.extend urlCommitter: (-> Travis.Urls.email(@get('commit.committerEmail')) ).property('commit.committerEmail') - - hasLoaded: (-> - @set('controllers.log.job', @get('build.firstJob')) if @get('build.firstJob') && !@get('build.isMatrix') - ).observes('build.id', 'build.firstJob') diff --git a/assets/scripts/app/controllers/job.coffee b/assets/scripts/app/controllers/job.coffee index c0d21f39..9d5734fe 100644 --- a/assets/scripts/app/controllers/job.coffee +++ b/assets/scripts/app/controllers/job.coffee @@ -1,5 +1,5 @@ Travis.JobController = Em.Controller.extend - needs: ['repo', 'log'] + needs: ['repo'] jobBinding: 'controllers.repo.job' repoBinding: 'controllers.repo.repo' @@ -16,7 +16,3 @@ Travis.JobController = Em.Controller.extend urlCommitter: (-> Travis.Urls.email(@get('commit.committerEmail')) ).property('commit.committerEmail') - - hasLoaded: (-> - @set('controllers.log.job', @get('job')) - ).observes('job.id') diff --git a/assets/scripts/app/controllers/log.coffee b/assets/scripts/app/controllers/log.coffee deleted file mode 100644 index a1f4b2eb..00000000 --- a/assets/scripts/app/controllers/log.coffee +++ /dev/null @@ -1,15 +0,0 @@ -Travis.LogController = Ember.Controller.extend - needs: ['repo'] - - logObserver: (-> - @unsubscribe() - @subscribe(@get('job')) - ).observes('job.logId') - - subscribe: (job) -> - job = @get('job') - job.subscribe() if job && !job.get('isFinished') - - unsubscribe: -> - job = @get('subscribed') - job.unsubscribe() if job diff --git a/assets/scripts/app/models/build.coffee b/assets/scripts/app/models/build.coffee index 4e802557..03b20781 100644 --- a/assets/scripts/app/models/build.coffee +++ b/assets/scripts/app/models/build.coffee @@ -30,10 +30,6 @@ require 'travis/model' @get('jobs.length') > 1 ).property('jobs.length') - firstJob: (-> - @get('jobs').objectAt(0) - ).property('jobs.length') - isFinished: (-> @get('state') in ['passed', 'failed', 'errored', 'canceled'] ).property('state') diff --git a/assets/scripts/app/routes.coffee b/assets/scripts/app/routes.coffee index 3de2cdd5..8a151361 100644 --- a/assets/scripts/app/routes.coffee +++ b/assets/scripts/app/routes.coffee @@ -112,7 +112,6 @@ Travis.JobRoute = Ember.Route.extend Travis.LineNumberParser, controller.set('lineNumber', lineNumber) repo = @container.lookup('controller:repo') - # console.log model.toString() repo.set('job', model) repo.activate('job') diff --git a/assets/scripts/app/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs index ca5a3bc4..c51ec673 100644 --- a/assets/scripts/app/templates/builds/show.hbs +++ b/assets/scripts/app/templates/builds/show.hbs @@ -53,7 +53,7 @@ {{view Travis.JobsView jobsBinding="build.requiredJobs" required="true"}} {{view Travis.JobsView jobsBinding="build.allowedFailureJobs"}} {{else}} - {{view Travis.LogView jobBinding="job"}} + {{view Travis.LogView jobBinding="build.jobs.firstObject"}} {{/if}} {{else}} There are no builds for this repository. diff --git a/assets/scripts/app/views/build.coffee b/assets/scripts/app/views/build.coffee index 379ddda6..12749afc 100644 --- a/assets/scripts/app/views/build.coffee +++ b/assets/scripts/app/views/build.coffee @@ -44,7 +44,6 @@ Travis.reopen BuildView: Travis.View.extend templateName: 'builds/show' - jobBinding: 'controller.job' classNameBindings: ['color', 'loading'] loadingBinding: 'controller.loading' diff --git a/assets/scripts/app/views/log.coffee b/assets/scripts/app/views/log.coffee index a88d60c8..cdd84d91 100644 --- a/assets/scripts/app/views/log.coffee +++ b/assets/scripts/app/views/log.coffee @@ -157,13 +157,16 @@ Travis.OrderedLogEngineMixin = Ember.Mixin.create url = Travis.Urls.plainTextLog(@get('log.id')) this.$("#log").append $("

Log was too long to display. Download the the raw version to get the full log.

") - Travis.reopen LogView: Travis.View.extend templateName: 'jobs/log' logBinding: 'job.log' contextBinding: 'job' + didInsertElement: -> + job = @get('job') + job.subscribe() if job && !job.get('isFinished') + willDestroyElement: -> job = @get('job') job.unsubscribe() if job