Make it possible to load ads from multiple DFP accounts

davireis · Sep 5, 2015 · 77008ca · 77008ca
1 parent b4890e0
commit 77008ca
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 8 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "jquery.dfp",
-    "version": "2.1.0",
+    "version": "2.2.0",
     "main": "jquery.dfp.js",
     "ignore": [
         "img/",

diff --git a/dfp.jquery.json b/dfp.jquery.json
@@ -8,7 +8,7 @@
         "ads",
         "advertising"
     ],
-    "version": "2.1.0",
+    "version": "2.2.0",
     "author": {
         "name": "Matt Cooper",
         "email": "[email protected]",

diff --git a/jquery.dfp.js b/jquery.dfp.js
@@ -1,5 +1,5 @@
 /**
- * jQuery DFP v2.1.0
+ * jQuery DFP v2.2.0
  * http://github.com/coop182/jquery.dfp.js
  *
  * Copyright 2015 Matt Cooper
@@ -159,11 +159,19 @@
 
                     } else {
 
+                        // Build slotName for loading
+                        var slotName;
+                        if (dfpID === '') {
+                            slotName = adUnitName;
+                        } else {
+                            slotName = '/' + dfpID + '/' + adUnitName;
+                        }
+
                         // Create the ad - out of page or normal
                         if ($adUnit.data('outofpage')) {
-                            googleAdUnit = googletag.defineOutOfPageSlot('/' + dfpID + '/' + adUnitName, adUnitID);
+                            googleAdUnit = googletag.defineOutOfPageSlot(slotName, adUnitID);
                         } else {
-                            googleAdUnit = googletag.defineSlot('/' + dfpID + '/' + adUnitName, dimensions, adUnitID);
+                            googleAdUnit = googletag.defineSlot(slotName, dimensions, adUnitID);
                             if ($adUnit.data('companion')) {
                                 googleAdUnit = googleAdUnit.addService(googletag.companionAds());
                             }

diff --git a/jquery.dfp.min.js b/jquery.dfp.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "jquery.dfp",
-    "version": "2.1.0",
+    "version": "2.2.0",
     "devDependencies": {
         "grunt": "~0.4",
         "grunt-contrib-jasmine": "^0.8.2",

diff --git a/tests/spec/adUnitSpec.js b/tests/spec/adUnitSpec.js
@@ -8,6 +8,30 @@ describe('Ad units', function () {
     beforeEach(cleanup);
     afterEach(cleanup);
 
+    it('Call to DFP with dfpID in adunit name', function (done) {
+        var id = 'xxxxxxx';
+
+        var dummyTag = {};
+        dummyTag.enableServices = function() {};
+
+        $('body').append('<div class="adunit" data-adunit="/' + id + '/Leader"></div>');
+        $.dfp({
+            googletag: dummyTag
+        });
+
+        waitsForAndRuns(function () {
+            if (typeof window.googletag.getVersion === 'function' && $('.adunit').data('googleAdUnit')) {
+                return true;
+            } else {
+                return false;
+            }
+        }, function () {
+            expect($('.adunit').data('googleAdUnit').getName()).toEqual('/' + id + '/Leader');
+            done();
+        }, 5000);
+
+    });
+
     it('Auto generate an ID for the ad unit if no ID provided', function (done) {
 
         var dummyTag = {};