From 9e9d056d7598c98c7fec4649c71a4675bcc5682c Mon Sep 17 00:00:00 2001
From: vi <vi.nguyen@redbubble.com>
Date: Fri, 4 Sep 2015 14:52:08 +1000
Subject: [PATCH] edited sizes for post bottom and fixed dfp googletag reload

---
 .../discourse/components/google-adsense.js.es6            | 4 ++--
 config/settings.yml                                       | 8 --------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/assets/javascripts/discourse/components/google-adsense.js.es6 b/assets/javascripts/discourse/components/google-adsense.js.es6
index e592bb7..f31529c 100644
--- a/assets/javascripts/discourse/components/google-adsense.js.es6
+++ b/assets/javascripts/discourse/components/google-adsense.js.es6
@@ -39,7 +39,7 @@ PageTracker.current().on('change', function(url) {
   if(preGoogleVars === null) {
     preGoogleVars = [];
     for(var key in window) {
-      if(key.indexOf("google") !== -1) {
+      if(key.indexOf("google") !== -1 && key.indexOf("googletag") == -1) {
         preGoogleVars.push(key);
       }
     }
@@ -55,7 +55,7 @@ PageTracker.current().on('change', function(url) {
       postGoogleVars = [];
 
       for(var key in window) {
-        if(key.indexOf("google") !== -1 && preGoogleVars.indexOf(key) == -1) {
+        if(key.indexOf("google") !== -1 && preGoogleVars.indexOf(key) == -1 && key.indexOf("googletag") == -1) {
           postGoogleVars.push(key);
         }
       }
diff --git a/config/settings.yml b/config/settings.yml
index 511e834..20ceb4d 100755
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -98,10 +98,6 @@ adsense_plugin:
       - 970*90 - large leaderboard
       - 468*60 - banner 
       - 234*60 - half banner 
-      - 125*125 - button 
-      - 180*150 - small rectangle
-      - 200*200 - small square
-      - 250*250 - square
   adsense_nth_post_code: 
     client: true
     default: ''
@@ -230,10 +226,6 @@ ad_plugin:
       - 970*90 - large leaderboard
       - 468*60 - banner 
       - 234*60 - half banner 
-      - 125*125 - button 
-      - 180*150 - small rectangle
-      - 200*200 - small square
-      - 250*250 - square
   dfp_show_post_bottom:
     client: true
     default: false