From e1a667407f55f11444636702c344b62ea3c601b9 Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Thu, 14 Mar 2013 16:29:22 +0100 Subject: [PATCH] fix after rebase --- assets/scripts/app/models/log.coffee | 4 ++-- assets/scripts/app/views/log.coffee | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/assets/scripts/app/models/log.coffee b/assets/scripts/app/models/log.coffee index de96b6f6..270287ac 100644 --- a/assets/scripts/app/models/log.coffee +++ b/assets/scripts/app/models/log.coffee @@ -11,8 +11,8 @@ require 'travis/chunk_buffer' @fetch() setParts: -> - #@set 'parts', Ember.ArrayProxy.create(content: []) - @set 'parts', Travis.ChunkBuffer.create(content: []) + @set 'parts', Ember.ArrayProxy.create(content: []) + # @set 'parts', Travis.ChunkBuffer.create(content: []) fetch: -> console.log 'log model: fetching log' if Log.DEBUG diff --git a/assets/scripts/app/views/log.coffee b/assets/scripts/app/views/log.coffee index b34e896a..ca585413 100644 --- a/assets/scripts/app/views/log.coffee +++ b/assets/scripts/app/views/log.coffee @@ -1,5 +1,4 @@ require 'log' -require 'travis/ordered_log' Log.DEBUG = false Log.LIMIT = 10000 @@ -10,6 +9,10 @@ Travis.reopen logBinding: 'job.log' contextBinding: 'job' + didInsertElement: -> + job = @get('job') + job.subscribe() if job && !job.get('isFinished') + willDestroyElement: -> job = @get('job') job.unsubscribe() if job