From 5b0b7d70026734f66f8be6984012f955b26eb8a9 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Mon, 10 Dec 2012 14:26:44 +0100 Subject: [PATCH] Fix isAttributeLoaded checks We can't check 'isFinished' when model is asked for isAttributeLoaded('state'). In such situation, it will go to isFinished and call @get('state'), which will trigger isAttributeLoaded('state') again. --- assets/scripts/app/models/build.coffee | 2 +- assets/scripts/app/models/job.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/scripts/app/models/build.coffee b/assets/scripts/app/models/build.coffee index 206bfa90..7bd63ee6 100644 --- a/assets/scripts/app/models/build.coffee +++ b/assets/scripts/app/models/build.coffee @@ -60,7 +60,7 @@ require 'travis/model' Travis.ajax.post '/requests', build_id: @get('id') isAttributeLoaded: (key) -> - if ['_duration', 'finishedAt', 'state'].contains(key) && !@get('isFinished') + if ['_duration', 'finishedAt'].contains(key) && !@get('isFinished') return true else @_super(key) diff --git a/assets/scripts/app/models/job.coffee b/assets/scripts/app/models/job.coffee index 3db2be51..fd37ae93 100644 --- a/assets/scripts/app/models/job.coffee +++ b/assets/scripts/app/models/job.coffee @@ -82,7 +82,7 @@ require 'travis/model' ).observes('state') isAttributeLoaded: (key) -> - if ['finishedAt', 'state'].contains(key) && !@get('isFinished') + if ['finishedAt'].contains(key) && !@get('isFinished') return true else if key == 'startedAt' && @get('state') == 'created' return true