From 030bab92a2215fb73e6ddedc7bf0e767a04d2a3d Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 2 Jan 2015 16:29:08 -0500 Subject: [PATCH] Small optimization: remove a template with an `{{if}}` --- .../conditional-loading-spinner.js.es6 | 16 +++++++++++++--- .../components/conditional-loading-spinner.hbs | 5 ----- 2 files changed, 13 insertions(+), 8 deletions(-) delete mode 100644 app/assets/javascripts/discourse/templates/components/conditional-loading-spinner.hbs 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 ca6d0386ae5..d7680762841 100644 --- a/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6 +++ b/app/assets/javascripts/discourse/components/conditional-loading-spinner.js.es6 @@ -1,8 +1,18 @@ -export default Ember.Component.extend({ +import StringBuffer from 'discourse/mixins/string-buffer'; + +export default Ember.Component.extend(StringBuffer, { classNameBindings: ['containerClass'], - layoutName: 'components/conditional-loading-spinner', + rerenderTriggers: ['condition'], containerClass: function() { return (this.get('size') === 'small') ? 'inline-spinner' : undefined; - }.property('size') + }.property('size'), + + renderString: function(buffer) { + if (this.get('condition')) { + buffer.push('
'); + } else { + return this._super(); + } + } }); diff --git a/app/assets/javascripts/discourse/templates/components/conditional-loading-spinner.hbs b/app/assets/javascripts/discourse/templates/components/conditional-loading-spinner.hbs deleted file mode 100644 index d1d27ae58e0..00000000000 --- a/app/assets/javascripts/discourse/templates/components/conditional-loading-spinner.hbs +++ /dev/null @@ -1,5 +0,0 @@ -{{#if condition}} -
-{{else}} - {{yield}} -{{/if}}