From 9e7b33f7c190bfb3fabd194348f96eec5bc222e6 Mon Sep 17 00:00:00 2001
From: Sarah Ni <snjqi188@gmail.com>
Date: Tue, 4 Aug 2015 11:25:00 +1000
Subject: [PATCH] Successful ads between nth post

---
 .DS_Store                                     | Bin 6148 -> 6148 bytes
 .../discourse/components/google-dfp-ad.js.es6 |   2 +-
 .../models/post_specific_count.js.es6         |   7 -------
 .../post-bottom/discourse-google-dfp.hbs      |   7 +++----
 .../initializers/extend-post-model.js.es6     |  12 ++++++++++++
 5 files changed, 16 insertions(+), 12 deletions(-)
 delete mode 100644 assets/javascripts/discourse/models/post_specific_count.js.es6
 create mode 100644 assets/javascripts/initializers/extend-post-model.js.es6

diff --git a/.DS_Store b/.DS_Store
index 598636897fdbe3e1c37cd8e5f61c47f408098c91..3ad4406a8359e1ffb2e5c461ace61400439b0bab 100644
GIT binary patch
delta 31
mcmZoMXffDez{0}7z`!`!gyk%!p}D!Kj)Jj?#bz$nUqS$Np9g>d

delta 31
lcmZoMXffDez{2t$2qv4boaHn!H8RpsFtjk*%*Fak2ms2o3vK`a

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')
+  	});
+  }
+};