From 13d2eba016913fa48ab10b0681d005a375f813b0 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Tue, 12 Jan 2016 18:26:10 +0100 Subject: [PATCH] [deprecations] Remove the need to use beforeObserver in job-log component --- app/components/job-log.js | 40 ++++++++++++++------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/app/components/job-log.js b/app/components/job-log.js index 4ce88a27..c4d01e9e 100644 --- a/app/components/job-log.js +++ b/app/components/job-log.js @@ -3,36 +3,24 @@ import Ember from 'ember'; export default Ember.Component.extend({ logBinding: 'job.log', - didInsertElement() { - Ember.run.scheduleOnce('afterRender', this, 'setupLog'); - }, + didReceiveAttrs: function(options) { + this._super(...arguments); - logDidChange: function() { - return this.setupLog(); - }.observes('log'), + if(options.oldAttrs && options.oldAttrs.job) { + this.teardownLog(options.oldAttrs.job.value); + } - logWillChange: function() { - return this.teardownLog(); - }.observesBefore('log'), - - willDestroyElement() { - Ember.run.scheduleOnce('afterRender', this, 'teardownLog'); - }, - - teardownLog() { - var job; - job = this.get('job'); - if (job) { - return job.unsubscribe(); + if(options.newAttrs && options.newAttrs.job) { + this.setupLog(options.newAttrs.job.value); } }, - setupLog() { - var job; - job = this.get('job'); - if (job) { - job.get('log').fetch(); - return job.subscribe(); - } + teardownLog(job) { + job.unsubscribe(); + }, + + setupLog(job) { + job.get('log').fetch(); + job.subscribe(); } });