From 1b7f642da6f95e4f32d723e4ec98e806e158f23d Mon Sep 17 00:00:00 2001 From: Eric Berry Date: Tue, 12 Jun 2018 15:21:23 -0600 Subject: [PATCH] Cleanup --- .../discourse/components/codefund-ad.js.es6 | 4 -- .../templates/components/codefund-ad.hbs | 52 +++++++++---------- 2 files changed, 25 insertions(+), 31 deletions(-) diff --git a/assets/javascripts/discourse/components/codefund-ad.js.es6 b/assets/javascripts/discourse/components/codefund-ad.js.es6 index b45ffba..9bb428e 100644 --- a/assets/javascripts/discourse/components/codefund-ad.js.es6 +++ b/assets/javascripts/discourse/components/codefund-ad.js.es6 @@ -97,8 +97,4 @@ export default Ember.Component.extend({ return this.get('placement') === 'topic-list-top'; }.property('placement'), - hasAd: function() { - return ((this.get('adDetails.description') || '').length > 0); - }.property('adDetails') - }); diff --git a/assets/javascripts/discourse/templates/components/codefund-ad.hbs b/assets/javascripts/discourse/templates/components/codefund-ad.hbs index 3902d2b..1c0f80d 100644 --- a/assets/javascripts/discourse/templates/components/codefund-ad.hbs +++ b/assets/javascripts/discourse/templates/components/codefund-ad.hbs @@ -1,31 +1,29 @@ {{#if showAd}} - {{#if hasAd}} - {{#if site.mobileView}} - {{#if displayPostBottom}} - {{partial "components/codefund/post-bottom"}} - {{/if}} - {{#if displayTopicAbovePostStream}} - {{partial "components/codefund/topic-above-post-stream"}} - {{/if}} - {{#if displayTopicAboveSuggested}} - {{partial "components/codefund/topic-above-suggested"}} - {{/if}} - {{#if displayTopicListTop}} - {{partial "components/codefund/topic-list-top"}} - {{/if}} - {{else}} - {{#if displayPostBottom}} - {{partial "components/codefund/post-bottom"}} - {{/if}} - {{#if displayTopicAbovePostStream}} - {{partial "components/codefund/topic-above-post-stream"}} - {{/if}} - {{#if displayTopicAboveSuggested}} - {{partial "components/codefund/topic-above-suggested"}} - {{/if}} - {{#if displayTopicListTop}} - {{partial "components/codefund/topic-list-top"}} - {{/if}} + {{#if site.mobileView}} + {{#if displayPostBottom}} + {{partial "components/codefund/post-bottom"}} + {{/if}} + {{#if displayTopicAbovePostStream}} + {{partial "components/codefund/topic-above-post-stream"}} + {{/if}} + {{#if displayTopicAboveSuggested}} + {{partial "components/codefund/topic-above-suggested"}} + {{/if}} + {{#if displayTopicListTop}} + {{partial "components/codefund/topic-list-top"}} + {{/if}} + {{else}} + {{#if displayPostBottom}} + {{partial "components/codefund/post-bottom"}} + {{/if}} + {{#if displayTopicAbovePostStream}} + {{partial "components/codefund/topic-above-post-stream"}} + {{/if}} + {{#if displayTopicAboveSuggested}} + {{partial "components/codefund/topic-above-suggested"}} + {{/if}} + {{#if displayTopicListTop}} + {{partial "components/codefund/topic-list-top"}} {{/if}} {{/if}} {{/if}} \ No newline at end of file