Merge branch 'master' of https://github.com/abecms/abecms

docs/types/abe-image.md

@@ -45,6 +45,8 @@ uploading a image named *my_image.jpg* will create a thumbs by default named my_
 
 if the tag contains ```thumbs='250x250,350x350'``` this will also create *my_image_thumb_250x250.jpg* & *my_image_thumb_350x350.jpg*
 
+if the tag contains ```thumbs='250x'``` or ```thumbs='x250'``` this will create an image that have the with / height specified and the other side no specified will be resized to keep the same ratio as the original image
+
 ###Important
 
 thumb are created using https://github.com/jwagner/smartcrop-cli which require to have imagemagick installed on your computer, if you don't a fallback library full JS is used (https://github.com/oliver-moran/jimp) but doesn't crop in a smart way your images

src/cli/cms/media/image.js

@@ -45,14 +45,24 @@ export function cropAndSaveFiles(images, file, resp) {
         size: image
       })
 
-      let newWidth = image.split('x')[0]
-      let newHeight = image.split('x')[1]
+      let splitedImage = image.split('x')
+      let newWidth = null
+      let newHeight = null
+
+      if(splitedImage[0] != null && splitedImage[0] != '') newWidth = parseInt(image.split('x')[0])
+      if(splitedImage[1] != null && splitedImage[1] != '') newHeight = parseInt(image.split('x')[1])
 
       Jimp.read(file).then(function (originalImage) {
         var originalWidth = originalImage.bitmap.width
         var originalHeight = originalImage.bitmap.height
         var ratio = originalWidth*newHeight/newWidth
-        if(parseInt(ratio - 1) <= parseInt(originalHeight) && parseInt(ratio + 1) >= parseInt(originalHeight)){
+        if(newWidth === null || newHeight === null){
+          originalImage.resize(newWidth != null ? newWidth : Jimp.AUTO, newHeight != null ? newHeight : Jimp.AUTO).write(newFile)
+          if(++cropedImage === length) {
+            resolve(resp)
+          }
+        }
+        else if(parseInt(ratio - 1) <= parseInt(originalHeight) && parseInt(ratio + 1) >= parseInt(originalHeight)){
           originalImage.resize(parseInt(image.split('x')[0]), parseInt(image.split('x')[1])).write(newFile)
           if(++cropedImage === length) {
             resolve(resp)