From 1e441522c077ea2f8d2509524230024cc6fad5b0 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 2 Jan 2015 16:35:56 -0500 Subject: [PATCH] Don't use a string buffer to refactor loading outlet --- .../components/conditional-loading-spinner.js.es6 | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6 b/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6 index d7680762841..19103360ddf 100644 --- a/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6 +++ b/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6 @@ -1,18 +1,19 @@ -import StringBuffer from 'discourse/mixins/string-buffer'; - -export default Ember.Component.extend(StringBuffer, { +export default Ember.Component.extend({ classNameBindings: ['containerClass'], - rerenderTriggers: ['condition'], containerClass: function() { return (this.get('size') === 'small') ? 'inline-spinner' : undefined; }.property('size'), - renderString: function(buffer) { + render: function(buffer) { if (this.get('condition')) { buffer.push('
'); } else { return this._super(); } - } + }, + + _conditionChanged: function() { + this.rerender(); + }.observes('condition') });