Merge branch 'develop'

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.10.2 - 2016-10-11
+
+- Optimized function `get_timber_image_responsive_src()` to directly return the image source when the image is an SVG or a GIF.
+
 ## 0.10.1 - 2016-05-25
 
 - Added composer.json to make it possible to load Timmy through Composer.

README.md

@@ -191,7 +191,7 @@ Returns the src for a TimberImage.
 
 `get_timber_image_responsive(int $post_id|TimberImage $timber_image, string $size)`
 
-Returns the srcset, size, alt and title attributes for a TimberImage.
+Returns the srcset, size, alt and title attributes for a TimberImage. If this function is used with an SVG or GIF image, the single src will be returned instead of srcset.
 
 ##### Usage in WordPress Templates
 

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "mindkomm/timmy",
-    "description": "Opt-in plugin for Timber Library to make it even more convenient to work with images.",
+    "description": "Advanced image manipulation for Timber.",
     "license": "MIT",
     "require": {
       "php": ">=5.3.0",

functions-images.php

@@ -126,6 +126,11 @@ function get_timber_image_responsive( $timber_image, $size ) {
 function get_timber_image_responsive_src( $timber_image, $size ) {
 	$timber_image = Timmy::get_timber_image( $timber_image );
 
+	// Directly return source when we have an SVG or GIF image.
+	if ( in_array( $timber_image->post_mime_type, [ 'image/svg+xml', 'image/gif' ], true ) ) {
+		return ' src="' . $timber_image->src . '"';
+	}
+
 	if ( ! $timber_image ) {
 		return false;
 	}

lib/Timmy.php

@@ -278,7 +278,7 @@ public function filter_image_downsize( $return = false, $attachment_id, $size )
 	 *
 	 * @param mixed $timber_image   The ID of the image, an array containing an ID key or
 	 *                              an instance of Timber\Image.
-	 * @return \Timber\Image        Instance of Timber\Image.
+	 * @return mixed                Instance of Timber\Image.
 	 */
 	public static function get_timber_image( $timber_image ) {
 		if ( is_numeric( $timber_image ) ) {