Fixes #49, accounts for the spans of the children aswell

AshesOfOwls · Jun 10, 2013 · c08902b · c08902b
1 parent 5eed5f5
commit c08902b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/core/jquery.shapeshift.coffee b/core/jquery.shapeshift.coffee
@@ -244,12 +244,17 @@
         columns = minColumns
       globals.columns = columns
 
-      # Columns cannot exceed children
+      # Columns cannot exceed children span
       children_count = @parsedChildren.length
       if columns > children_count
-        columns = 0
+        actual_columns = 0
         for i in [0...@parsedChildren.length]
-          columns += @parsedChildren[i].colspan
+          colspan = @parsedChildren[i].colspan
+
+          if colspan + actual_columns <= columns
+            actual_columns += colspan
+
+        columns = actual_columns
 
       # Calculate the child offset from the left
       globals.child_offset = padding_x

diff --git a/core/jquery.shapeshift.js b/core/jquery.shapeshift.js