Properly handling a 0 value containerPadding config parameter.

folkevil · Mar 29, 2016 · 9be4ac8 · 9be4ac8
1 parent c3fceae
commit 9be4ac8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -170,9 +170,9 @@ function computeLayout(itemLayoutData) {
 
 	// We need to clean up the bottom container padding
 	// First remove the height added for box spacing
-	layoutData._containerHeight = layoutData._containerHeight - (layoutConfig.boxSpacing.vertical || layoutConfig.boxSpacing);
+	layoutData._containerHeight = layoutData._containerHeight - layoutConfig.boxSpacing.vertical;
 	// Then add our bottom container padding
-	layoutData._containerHeight = layoutData._containerHeight + (layoutConfig.containerPadding.bottom || layoutConfig.containerPadding);
+	layoutData._containerHeight = layoutData._containerHeight + layoutConfig.containerPadding.bottom;
 
 	return {
 		containerHeight: layoutData._containerHeight,

diff --git a/src/index.js b/src/index.js
@@ -173,9 +173,9 @@ function computeLayout(itemLayoutData) {
 
 	// We need to clean up the bottom container padding
 	// First remove the height added for box spacing
-	layoutData._containerHeight = layoutData._containerHeight - (layoutConfig.boxSpacing.vertical || layoutConfig.boxSpacing);
+	layoutData._containerHeight = layoutData._containerHeight - layoutConfig.boxSpacing.vertical;
 	// Then add our bottom container padding
-	layoutData._containerHeight = layoutData._containerHeight + (layoutConfig.containerPadding.bottom || layoutConfig.containerPadding);
+	layoutData._containerHeight = layoutData._containerHeight + layoutConfig.containerPadding.bottom;
 
 	return {
 		containerHeight: layoutData._containerHeight,

diff --git a/test/test.js b/test/test.js
@@ -191,6 +191,17 @@ describe('justified-layout', function() {
 
 		});
 
+		it('should handle 0 padding', function() {
+
+			var geometry = justifiedLayout([1, 1, 1], {
+				containerPadding: 0,
+				targetRowHeightTolerance: 0
+			});
+
+			expect(geometry.containerHeight).toEqual(320);
+
+		});
+
 	});
 
 });