Image smaller than the container should not be upscaled when "fill" i…

…s set to false
karacas · Feb 24, 2017 · c28b326 · c28b326
1 parent 2409266
commit c28b326
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/js/imgLiquid.js b/js/imgLiquid.js
@@ -156,7 +156,7 @@ imgLiquid.injectCss = '.imgLiquid img {visibility:hidden}';
 					}
 
 					$imgBoxCont.css({
-						'background-size':		(settings.fill) ? 'cover' : 'contain',
+						'background-size':		(!settings.fill && $img[0].width <= $imgBoxCont.width() && $img[0].height <= $imgBoxCont.height()) ? 'auto' : (settings.fill) ? 'cover' : 'contain',
 						'background-position':	(settings.horizontalAlign + ' ' + settings.verticalAlign).toLowerCase(),
 						'background-repeat':	'no-repeat'
 					});
@@ -325,16 +325,23 @@ imgLiquid.injectCss = '.imgLiquid img {visibility:hidden}';
 
 
 					// Compare ratio
-					if (settings.fill === ($imgCW / $imgCH) >= ($img.data('owidth') / $img.data('oheight'))) {
-						w = '100%';
+					if (!settings.fill && $img.data('owidth') <= $imgCW && $img.data('oheight') <= $imgCH) {
+						w = 'auto';
 						h = 'auto';
-						wn = Math.floor($imgCW);
-						hn = Math.floor($imgCW * ($img.data('oheight') / $img.data('owidth')));
+						wn = $img.data('owidth');
+						hn = $img.data('oheight');
 					} else {
-						w = 'auto';
-						h = '100%';
-						wn = Math.floor($imgCH * ($img.data('owidth') / $img.data('oheight')));
-						hn = Math.floor($imgCH);
+						if (settings.fill === ($imgCW / $imgCH) >= ($img.data('owidth') / $img.data('oheight'))) {
+							w = '100%';
+							h = 'auto';
+							wn = Math.floor($imgCW);
+							hn = Math.floor($imgCW * ($img.data('oheight') / $img.data('owidth')));
+						} else {
+							w = 'auto';
+							h = '100%';
+							wn = Math.floor($imgCH * ($img.data('owidth') / $img.data('oheight')));
+							hn = Math.floor($imgCH);
+						}
 					}
 
 					// Align X