Merge branch 'Skodin-master'

Mastergalen · Nov 30, 2016 · d2377c3 · d2377c3
2 parents 13fe816 + 1dcf592
commit d2377c3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
     "keywords": [ "laravel", "adsense", "ads" ],
     "require": {
         "php": ">=5.4.0",
-        "illuminate/view": "5.0.*|5.1.*|5.2.*"
+        "illuminate/view": "5.0.*|5.1.*|5.2.*|5.3.*"
     },
     "authors": [
         {

diff --git a/src/AdsBuilder.php b/src/AdsBuilder.php
@@ -8,7 +8,7 @@ public function show($name) {
             'ad_client' => config("ads.client_id"),
             'ad_style' => config("ads.ads.$name.ad_style", "display:block;"),
             'ad_slot' => config("ads.ads.$name.ad_unit_id"),
-            'ad_format' => config("ads.ads.$name.format", "auto")
+            'ad_format' => config("ads.ads.$name.ad_format", null)
         ]);
     }
 }
diff --git a/src/config/ads.php b/src/config/ads.php
@@ -10,7 +10,6 @@
         'rectangle' => [
             'ad_unit_id' => 1234567890,
             'ad_style' => 'display:inline-block;width:300px;height:250px',
-            'ad_format' => 'auto'
         ]
     ]
 ];

diff --git a/src/views/ad.blade.php b/src/views/ad.blade.php
@@ -1,10 +1,14 @@
 <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
 <!-- Mods Center Responsive -->
 <ins class="adsbygoogle"
-     style="{!! $ad_style !!}"
-     data-ad-client="{!! $ad_client !!}"
-     data-ad-slot="{!! $ad_slot !!}"
-     data-ad-format="{!! $ad_format !!}"></ins>
+    style="{!! $ad_style !!}"
+    data-ad-client="{!! $ad_client !!}"
+    data-ad-slot="{!! $ad_slot !!}"
+    @if(isset($ad_format))
+        data-ad-format="{!! $ad_format !!}"
+    @endif
+    >
+</ins>
 <script>
     (adsbygoogle = window.adsbygoogle || []).push({});
-</script>
+</script>