diff --git a/.DS_Store b/.DS_Store index 5986368..3ad4406 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/assets/javascripts/discourse/components/google-dfp-ad.js.es6 b/assets/javascripts/discourse/components/google-dfp-ad.js.es6 index 71a84b1..f693d79 100755 --- a/assets/javascripts/discourse/components/google-dfp-ad.js.es6 +++ b/assets/javascripts/discourse/components/google-dfp-ad.js.es6 @@ -36,7 +36,7 @@ function loadGoogle(settings) { googletag.defineSlot(settings.dfp_topic_above_suggested_code, [parseInt(settings.dfp_size_topic_above_suggested_width_code), parseInt(settings.dfp_size_topic_above_suggested_height_code)], 'div-gpt-ad-topic-above-suggested').addService(googletag.pubads()); } if (settings.dfp_post_bottom_code && !settings.dfp_show_post_bottom) { - googletag.defineSlot(settings.dfp_post_bottom_code, [parseInt(settings.dfp_size_post_bottom_width_code), parseInt(settings.dfp_size_post_bottom_height_code)], 'div-gpt-ad-post-bottom').addService(googletag.pubads()); + googletag.defineSlot(settings.dfp_post_bottom_code, [parseInt(settings.dfp_size_post_bottom_width_code), parseInt(settings.dfp_size_post_bottom_height_code)], 'div-gpt-ad-post-bottom').addService(googletag.pubads()); } googletag.pubads().enableSingleRequest(); googletag.enableServices(); diff --git a/assets/javascripts/discourse/models/post_specific_count.js.es6 b/assets/javascripts/discourse/models/post_specific_count.js.es6 deleted file mode 100644 index 2ebb2c7..0000000 --- a/assets/javascripts/discourse/models/post_specific_count.js.es6 +++ /dev/null @@ -1,7 +0,0 @@ -export default Ember.Model.extend({ - - PostSpecificCount: function() { - return this.get('post_number') % 5 === 0; - }.property('post_number'), - -}) \ No newline at end of file diff --git a/assets/javascripts/discourse/templates/connectors/post-bottom/discourse-google-dfp.hbs b/assets/javascripts/discourse/templates/connectors/post-bottom/discourse-google-dfp.hbs index 9e32482..ea8e1c3 100644 --- a/assets/javascripts/discourse/templates/connectors/post-bottom/discourse-google-dfp.hbs +++ b/assets/javascripts/discourse/templates/connectors/post-bottom/discourse-google-dfp.hbs @@ -1,4 +1,3 @@ - -{{#if Discourse.PostSpecificCount}} - {{google-dfp-ad placement="post-bottom"}} - {{/if}} +{{#if postSpecificCount}} + {{google-dfp-ad placement="post-bottom"}} + {{/if}} diff --git a/assets/javascripts/initializers/extend-post-model.js.es6 b/assets/javascripts/initializers/extend-post-model.js.es6 new file mode 100644 index 0000000..90b2dcb --- /dev/null +++ b/assets/javascripts/initializers/extend-post-model.js.es6 @@ -0,0 +1,12 @@ +import PostModel from 'discourse/models/post'; + +export default { + name: 'extend-post-model', + initialize() { + PostModel.reopen({ + postSpecificCount: function() { + return this.get('post_number') % 2 === 0; + }.property('post_number') + }); + } +};