use always use width of parent element if data-parent-fit is used (fi…

…xes issue #137)
aFarkas · Aug 4, 2015 · ada946c · ada946c
1 parent f4f73f3
commit ada946c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/plugins/parent-fit/ls.parent-fit.js b/plugins/parent-fit/ls.parent-fit.js
@@ -54,11 +54,10 @@
 			return dims.w / dims.h;
 		},
 		calculateSize: function(element, width){
-			var displayRatio, height, imageRatio;
+			var displayRatio, height, imageRatio, retWidth;
 			var fitObj = this.getFit(element);
 			var fit = fitObj.fit;
 			var fitElem = fitObj.parent;
-			var retWidth = width;
 
 			if(fit != 'width' && ((fit != 'contain' && fit != 'cover') || !(imageRatio = this.getImageRatio(element)))){return width;}
 
@@ -68,6 +67,8 @@
 				fitElem = element;
 			}
 
+			retWidth = width;
+
 			if(fit == 'width'){
 				retWidth = width;
 			} else {

diff --git a/plugins/parent-fit/ls.parent-fit.min.js b/plugins/parent-fit/ls.parent-fit.min.js