From afa2262b1cace28534db21d7554661a7ccfc67f4 Mon Sep 17 00:00:00 2001
From: Sarah Ni <snjqi188@gmail.com>
Date: Wed, 2 Sep 2015 13:13:53 +1000
Subject: [PATCH] Topic list top custom targeting multiple keys working

---
 .../discourse/components/google-dfp-ad.js.es6 | 67 +++++++++----------
 .../templates/components/google-adsense.hbs   |  1 -
 .../templates/components/google-dfp-ad.hbs    |  2 -
 3 files changed, 31 insertions(+), 39 deletions(-)

diff --git a/assets/javascripts/discourse/components/google-dfp-ad.js.es6 b/assets/javascripts/discourse/components/google-dfp-ad.js.es6
index 1ec5478..154280c 100755
--- a/assets/javascripts/discourse/components/google-dfp-ad.js.es6
+++ b/assets/javascripts/discourse/components/google-dfp-ad.js.es6
@@ -38,9 +38,6 @@ function keyParse(word) {
   return key; 
 }
 
-
-
-
 function loadGoogle(settings) {
   if (_loaded) {
     return Ember.RSVP.resolve();
@@ -58,38 +55,32 @@ function loadGoogle(settings) {
       console.log('googletag is undefined!');
     }
 
-    var topic_list_top = googletag.defineSlot('/' + settings.dfp_publisher_id + '/' + settings.dfp_topic_list_top_code, [parseInt(splitWidthInt(Discourse.SiteSettings.topic_list_top_ad_sizes)), parseInt(splitHeightInt(Discourse.SiteSettings.topic_list_top_ad_sizes))], 'div-gpt-ad-topic-list-top');
-
-    var DefineSlotFactory = {
-      create: function(type){
-        return type;
-      }
-    }
-
-    // This sets the key and value for custom targeting
-    var Foo = function(key, value, googletag) {
-      this.locationKey = key;
-      this.locationValue = value;
-      this.googletag = googletag;
-    }
-
-    // setTargeting is not defined.  We want to return as a method - PROBLEM 1
-    Foo.prototype.bar = function() {
-      return this.googletag.setTargeting(this.locationKey, this.locationValue);
-    }
-
-    // This should call googletag.setTargeting(key for that location, value for that location)
-    function custom_targeting(key_array, value_array) {
-      for (var i = 0; i < key_array.length; i++) {
-        var wordValue = valueParse(value_array[i]);
-        var f = new Foo(key_array[i], wordValue, DefineSlotFactory.create(topic_list_top));    
-        return f.bar();
-      }
-    }
-
-
-   
     googletag.cmd.push(function() {
+
+      var topic_list_top = googletag.defineSlot('/' + settings.dfp_publisher_id + '/' + settings.dfp_topic_list_top_code, [parseInt(splitWidthInt(Discourse.SiteSettings.topic_list_top_ad_sizes)), parseInt(splitHeightInt(Discourse.SiteSettings.topic_list_top_ad_sizes))], 'div-gpt-ad-topic-list-top').addService(googletag.pubads());
+
+      // This sets the key and value for custom targeting
+      var Foo = function(key, value, googletag) {
+        this.locationKey = key;
+        this.locationValue = value;
+        this.googletag = googletag;
+      }
+
+      // setTargeting is not defined.  We want to return as a method - PROBLEM 1
+      Foo.prototype.bar = function() {
+        return this.googletag.setTargeting(this.locationKey, this.locationValue);
+      }
+
+      // This should call googletag.setTargeting(key for that location, value for that location)
+      function custom_targeting(key_array, value_array, location) {
+        var f;
+        for (var i = 0; i < key_array.length; i++) {
+          var wordValue = valueParse(value_array[i]);
+          f = new Foo(key_array[i], wordValue, location);    
+          f.bar();
+        }
+      }
+
       if (settings.dfp_topic_list_top_code && !settings.dfp_show_topic_list_top && settings.topic_list_top_ad_sizes) {
         const_width = parseInt(splitWidthInt(settings.topic_list_top_ad_sizes));
         const_height = parseInt(splitHeightInt(settings.topic_list_top_ad_sizes));
@@ -97,8 +88,12 @@ function loadGoogle(settings) {
           googletag.defineSlot(settings.dfp_topic_list_top_code, [320,50], 'div-gpt-ad-topic-list-top').addService(googletag.pubads());
         }
         else {
-          custom_targeting((keyParse(Discourse.SiteSettings.dfp_target_topic_list_top_key_code)), (keyParse(Discourse.SiteSettings.dfp_target_topic_list_top_value_code)))
-          .addService(googletag.pubads());
+          //googletag.defineSlot('/' + settings.dfp_publisher_id + '/' + settings.dfp_topic_list_top_code, [parseInt(splitWidthInt(settings.topic_list_top_ad_sizes)), parseInt(splitHeightInt(settings.topic_list_top_ad_sizes))], 'div-gpt-ad-topic-list-top')
+          //.setTargeting('category', ['clothes'])
+          //.setTargeting('gender', ['male'])
+          //.addService(googletag.pubads());
+          //.setTargeting("category", ["clothes"]);    
+          custom_targeting((keyParse(Discourse.SiteSettings.dfp_target_topic_list_top_key_code)), (keyParse(Discourse.SiteSettings.dfp_target_topic_list_top_value_code)), topic_list_top)
         }
       }
       if (settings.dfp_topic_above_post_stream_code && !settings.dfp_show_topic_above_post_stream && settings.topic_above_post_stream_ad_sizes) {
diff --git a/assets/javascripts/discourse/templates/components/google-adsense.hbs b/assets/javascripts/discourse/templates/components/google-adsense.hbs
index ca671d9..f98d0d7 100644
--- a/assets/javascripts/discourse/templates/components/google-adsense.hbs
+++ b/assets/javascripts/discourse/templates/components/google-adsense.hbs
@@ -12,7 +12,6 @@
 </div>
 
 {{else}}
-<div class="google-adsense-label"><h2>Google Adsense</h2></div>
 <div style={{adWrapperStyle}}>
     <ins class="adsbygoogle"
          style={{adInsStyle}}
diff --git a/assets/javascripts/discourse/templates/components/google-dfp-ad.hbs b/assets/javascripts/discourse/templates/components/google-dfp-ad.hbs
index 486c4b0..ca96b4c 100755
--- a/assets/javascripts/discourse/templates/components/google-dfp-ad.hbs
+++ b/assets/javascripts/discourse/templates/components/google-dfp-ad.hbs
@@ -1,5 +1,3 @@
-<div class="google-dfp-ad-label"><h2>Google Ad Plugin Display</h2></div>
-
 {{#if site.mobileView}}
   {{#if loadedGoogletag}}
     <div id={{divId}} style={{adWrapperStyleMobile}} class="dfp-ad-unit" align=center>