add settings to allow for companion ads and autoplay companion ads

davireis · Oct 6, 2014 · ab65c2e · ab65c2e
1 parent b68cdcc
commit ab65c2e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@ tmp/
 *.bak
 *.swp
 *~.nib
+*.log
 local.properties
 .classpath
 .settings/

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "jquery.dfp",
-    "version": "1.1.4",
+    "version": "1.1.5",
     "main": "jquery.dfp.js",
     "ignore": [
         "img/",

diff --git a/jquery.dfp.js b/jquery.dfp.js
@@ -146,7 +146,13 @@
                     if ($adUnit.data('outofpage')) {
                         googleAdUnit = window.googletag.defineOutOfPageSlot('/' + dfpID + '/' + adUnitName, adUnitID).addService(window.googletag.pubads());
                     } else {
-                        googleAdUnit = window.googletag.defineSlot('/' + dfpID + '/' + adUnitName, dimensions, adUnitID).addService(window.googletag.pubads());
+                        if ($adUnit.data('companion')) {
+                            googleAdUnit = window.googletag.defineSlot('/' + dfpID + '/' + adUnitName, dimensions, adUnitID)
+                            .addService(window.googletag.companionAds()).addService(window.googletag.pubads());
+                        } else {
+                            googleAdUnit = window.googletag.defineSlot('/' + dfpID + '/' + adUnitName, dimensions, adUnitID)
+                            .addService(window.googletag.pubads());
+                        }
                     }
 
                 }
@@ -229,7 +235,13 @@
             if (dfpOptions.disablePublisherConsole) {
                 window.googletag.pubads().disablePublisherConsole();
             }
+            if (dfpOptions.companionAds) {
+                window.googletag.companionAds().setRefreshUnfilledSlots(true);
 
+                if (!dfpOptions.disableInitialLoad) {
+                    window.googletag.pubads().enableVideoAds();
+                }
+            }
             if (dfpOptions.disableInitialLoad) {
                 window.googletag.pubads().disableInitialLoad();
             }

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": "1.1.4",
+	"version": "1.1.5",
 	"devDependencies": {
 		"grunt": "~0.4",
 		"grunt-contrib-jshint": "~0.9",
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,7 @@ tmp/ @@
     *.bak
     *.swp
     *~.nib
+    *.log
     local.properties
     .classpath
     .settings/
@@ Expand Down @@