Merge pull request #23 from pboivin/fix/omit-type-if-webp-not-enabled

Minor optimizations when webp_support is not enabled

README.md

@@ -406,7 +406,7 @@ See [above section](#preset) about the `preset` method.
 |---|---|---|---|
 |`background_color`|`string`|`#e3e3e3`|   |
 |`lqip`|`boolean`|`true`|Uses Twill LQIP method to generate responsive placeholder|
-|`webp_support`|`boolean`|`true`|   |
+|`webp_support`|`boolean`|`true`|If set to `false`, the `type` attribute is omitted from `<source>` elements|
 |`presets`|`object`|   |   |
 
 ## Art directed images

resources/views/picture.blade.php

@@ -6,7 +6,9 @@
         @isset($sources)
             @foreach($sources as $source)
                 <source
-                    type="{{ $source['type'] }}"
+                    @if(config('twill-image.webp_support'))
+                        type="{{ $source['type'] }}"
+                    @endif
                     @if(isset($source['mediaQuery']))
                         media="{{ $source['mediaQuery'] }}"
                     @endif

src/Services/MediaSource.php

@@ -291,7 +291,7 @@ protected function media()
 
     public function toArray()
     {
-        return [
+        return array_merge([
             "alt" => $this->alt(),
             "aspectRatio" => $this->aspectRatio(),
             "caption" => $this->caption(),
@@ -302,10 +302,11 @@ public function toArray()
             "ratio" => $this->ratio(),
             "src" => $this->src(),
             "srcSet" => $this->srcSet(),
+            "width" => $this->width(),
+        ], (config('twill-image.webp_support') ? [
             "srcWebp" => $this->srcWebp(),
             "srcSetWebp" => $this->srcSetWebp(),
-            "width" => $this->width(),
-        ];
+        ] : []));
     }
 
     /**