Merging coop182#31 and bumping version

davireis · Jul 9, 2013 · d23735d · d23735d
1 parent c05d636
commit d23735d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/Readme.markdown b/Readme.markdown
@@ -218,5 +218,6 @@ Thanks to:
 
 <ul>
     <li>@crccheck - https://github.com/crccheck</li>
+    <li>@larryaubstore - https://github.com/larryaubstore</li>
     <li>@MikeSilvis - https://github.com/MikeSilvis</li>
 </ul>
diff --git a/dfp.jquery.json b/dfp.jquery.json
@@ -8,7 +8,7 @@
         "ads",
         "advertising"
     ],
-    "version": "1.0.13",
+    "version": "1.0.14",
     "author": {
         "name": "Matt Cooper",
         "email": "[email protected]",

diff --git a/jquery.dfp.js b/jquery.dfp.js
@@ -1,5 +1,5 @@
 /**
- * jQuery DFP v1.0.13
+ * jQuery DFP v1.0.14
  * http://github.com/coop182/jquery.dfp.js
  *
  * Copyright 2013 Matt Cooper
@@ -146,8 +146,9 @@
                 }
 
                 // Sets custom targeting for just THIS ad unit if it has been specified
-                if ($adUnit.data("targeting")) {
-                    $.each($adUnit.data("targeting"), function (k, v) {
+                var targeting = $adUnit.data("targeting");
+                if (targeting) {
+                    $.each(targeting, function (k, v) {
                         googleAdUnit.setTargeting(k, v);
                     });
                 }

diff --git a/jquery.dfp.min.js b/jquery.dfp.min.js