From 846e573766487c1e2379b97cfd68485c6c669932 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 8 Sep 2017 10:15:08 -0400 Subject: [PATCH] Use a connector class to determine wheteher to render presence --- .../discourse/components/composer-presence-display.js.es6 | 2 +- .../templates/connectors/composer-fields/presence.hbs | 4 +--- .../templates/connectors/composer-fields/presence.js.es6 | 5 +++++ 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.js.es6 diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 index 44184dd2c8e..4c2437e99b5 100644 --- a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 +++ b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 @@ -18,4 +18,4 @@ export default Ember.Component.extend({ return length > 0; } -}); \ No newline at end of file +}); diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.hbs b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.hbs index 0f3c2e1b95b..127cb33575e 100644 --- a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.hbs +++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.hbs @@ -1,3 +1 @@ -{{#if siteSettings.presence_enabled}} - {{composer-presence-display}} -{{/if}} +{{composer-presence-display}} diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.js.es6 new file mode 100644 index 00000000000..00fbc34d912 --- /dev/null +++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/composer-fields/presence.js.es6 @@ -0,0 +1,5 @@ +export default { + shouldRender(_, ctx) { + return ctx.siteSettings.presence_enabled; + } +};