From 933b9718cb39c8c534df3c94087078228b6093e6 Mon Sep 17 00:00:00 2001
From: suprb <info@suprb.com>
Date: Tue, 22 Jan 2013 16:47:32 +0100
Subject: [PATCH] Fixes

---
 index.html       | 344 +----------------------------------------------
 jquery.nested.js |  20 ++-
 style.css        |  16 +--
 3 files changed, 21 insertions(+), 359 deletions(-)

diff --git a/index.html b/index.html
index 9eaa6d5..13ca855 100755
--- a/index.html
+++ b/index.html
@@ -34,7 +34,6 @@
   <div class="box size21">5</div>
   <div class="box size12">6</div>
   <div class="box size21">7</div>
-<!-- 
   <div class="box size11">8</div>
   <div class="box size31">9</div>
   <div class="box size22">10</div>
@@ -56,352 +55,11 @@
   <div class="box size21">26</div>
   <div class="box size22">27</div>
   <div class="box size22">28</div>
-
-  <div class="box size11">1</div>
-  <div class="box size21">2</div>
-  <div class="box size32">3</div>
-  <div class="box size11">4</div>
-  <div class="box size21">5</div>
-  <div class="box size12">6</div>
-  <div class="box size21">7</div>
-  <div class="box size11">8</div>
-  <div class="box size31">9</div>
-  <div class="box size22">10</div>
-  <div class="box size11">11</div>
-  <div class="box size21">12</div>
-  <div class="box size12">13</div>
-  <div class="box size21">14</div>
-  <div class="box size23">15</div>
-  <div class="box size22">16</div>
-  <div class="box size11">17</div>
-  <div class="box size21">18</div>
-  <div class="box size12">19</div>
-  <div class="box size21">20</div>
-  <div class="box size22">21</div>
-  <div class="box size23">22</div>
-  <div class="box size11">23</div>
-  <div class="box size21">24</div>
-  <div class="box size12">25</div>
-  <div class="box size21">26</div>
-  <div class="box size22">27</div>
-  <div class="box size22">28</div>
- 
-  <div class="box size11">1</div>
-  <div class="box size21">2</div>
-  <div class="box size32">3</div>
-  <div class="box size11">4</div>
-  <div class="box size21">5</div>
-  <div class="box size12">6</div>
-  <div class="box size21">7</div>
-  <div class="box size11">8</div>
-  <div class="box size31">9</div>
-  <div class="box size22">10</div>
-  <div class="box size11">11</div>
-  <div class="box size21">12</div>
-  <div class="box size12">13</div>
-  <div class="box size21">14</div>
-  <div class="box size23">15</div>
-  <div class="box size22">16</div>
-  <div class="box size11">17</div>
-  <div class="box size21">18</div>
-  <div class="box size12">19</div>
-  <div class="box size21">20</div>
-  <div class="box size22">21</div>
-  <div class="box size23">22</div>
-  <div class="box size11">23</div>
-  <div class="box size21">24</div>
-  <div class="box size12">25</div>
-  <div class="box size21">26</div>
-  <div class="box size22">27</div>
-  <div class="box size22">28</div>
-
-  <div class="box size11">1</div>
-  <div class="box size21">2</div>
-  <div class="box size32">3</div>
-  <div class="box size11">4</div>
-  <div class="box size21">5</div>
-  <div class="box size12">6</div>
-  <div class="box size21">7</div>
-  <div class="box size11">8</div>
-  <div class="box size31">9</div>
-  <div class="box size22">10</div>
-  <div class="box size11">11</div>
-  <div class="box size21">12</div>
-  <div class="box size12">13</div>
-  <div class="box size21">14</div>
-  <div class="box size23">15</div>
-  <div class="box size22">16</div>
-  <div class="box size11">17</div>
-  <div class="box size21">18</div>
-  <div class="box size12">19</div>
-  <div class="box size21">20</div>
-  <div class="box size22">21</div>
-  <div class="box size23">22</div>
-  <div class="box size11">23</div>
-  <div class="box size21">24</div>
-  <div class="box size12">25</div>
-  <div class="box size21">26</div>
-  <div class="box size22">27</div>
-  <div class="box size22">28</div>
-    <div class="box size11">1</div>
-  <div class="box size21">2</div>
-  <div class="box size32">3</div>
-  <div class="box size11">4</div>
-  <div class="box size21">5</div>
-  <div class="box size12">6</div>
-  <div class="box size21">7</div>
-  <div class="box size11">8</div>
-  <div class="box size31">9</div>
-  <div class="box size22">10</div>
-  <div class="box size11">11</div>
-  <div class="box size21">12</div>
-  <div class="box size12">13</div>
-  <div class="box size21">14</div>
-  <div class="box size23">15</div>
-  <div class="box size22">16</div>
-  <div class="box size11">17</div>
-  <div class="box size21">18</div>
-  <div class="box size12">19</div>
-  <div class="box size21">20</div>
-  <div class="box size22">21</div>
-  <div class="box size23">22</div>
-  <div class="box size11">23</div>
-  <div class="box size21">24</div>
-  <div class="box size12">25</div>
-  <div class="box size21">26</div>
-  <div class="box size22">27</div>
-  <div class="box size22">28</div>
-    <div class="box size11">1</div>
-  <div class="box size21">2</div>
-  <div class="box size32">3</div>
-  <div class="box size11">4</div>
-  <div class="box size21">5</div>
-  <div class="box size12">6</div>
-  <div class="box size21">7</div>
-  <div class="box size11">8</div>
-  <div class="box size31">9</div>
-  <div class="box size22">10</div>
-  <div class="box size11">11</div>
-  <div class="box size21">12</div>
-  <div class="box size12">13</div>
-  <div class="box size21">14</div>
-  <div class="box size23">15</div>
-  <div class="box size22">16</div>
-  <div class="box size11">17</div>
-  <div class="box size21">18</div>
-  <div class="box size12">19</div>
-  <div class="box size21">20</div>
-  <div class="box size22">21</div>
-  <div class="box size23">22</div>
-  <div class="box size11">23</div>
-  <div class="box size21">24</div>
-  <div class="box size12">25</div>
-  <div class="box size21">26</div>
-  <div class="box size22">27</div>
-  <div class="box size22">28</div>
-    <div class="box size11">1</div>
-  <div class="box size21">2</div>
-  <div class="box size32">3</div>
-  <div class="box size11">4</div>
-  <div class="box size21">5</div>
-  <div class="box size12">6</div>
-  <div class="box size21">7</div>
-  <div class="box size11">8</div>
-  <div class="box size31">9</div>
-  <div class="box size22">10</div>
-  <div class="box size11">11</div>
-  <div class="box size21">12</div>
-  <div class="box size12">13</div>
-  <div class="box size21">14</div>
-  <div class="box size23">15</div>
-  <div class="box size22">16</div>
-  <div class="box size11">17</div>
-  <div class="box size21">18</div>
-  <div class="box size12">19</div>
-  <div class="box size21">20</div>
-  <div class="box size22">21</div>
-  <div class="box size23">22</div>
-  <div class="box size11">23</div>
-  <div class="box size21">24</div>
-  <div class="box size12">25</div>
-  <div class="box size21">26</div>
-  <div class="box size22">27</div>
-  <div class="box size22">28</div>
-    <div class="box size11">1</div>
-  <div class="box size21">2</div>
-  <div class="box size32">3</div>
-  <div class="box size11">4</div>
-  <div class="box size21">5</div>
-  <div class="box size12">6</div>
-  <div class="box size21">7</div>
-  <div class="box size11">8</div>
-  <div class="box size31">9</div>
-  <div class="box size22">10</div>
-  <div class="box size11">11</div>
-  <div class="box size21">12</div>
-  <div class="box size12">13</div>
-  <div class="box size21">14</div>
-  <div class="box size23">15</div>
-  <div class="box size22">16</div>
-  <div class="box size11">17</div>
-  <div class="box size21">18</div>
-  <div class="box size12">19</div>
-  <div class="box size21">20</div>
-  <div class="box size22">21</div>
-  <div class="box size23">22</div>
-  <div class="box size11">23</div>
-  <div class="box size21">24</div>
-  <div class="box size12">25</div>
-  <div class="box size21">26</div>
-  <div class="box size22">27</div>
-  <div class="box size22">28</div>
-    <div class="box size11">1</div>
-  <div class="box size21">2</div>
-  <div class="box size32">3</div>
-  <div class="box size11">4</div>
-  <div class="box size21">5</div>
-  <div class="box size12">6</div>
-  <div class="box size21">7</div>
-  <div class="box size11">8</div>
-  <div class="box size31">9</div>
-  <div class="box size22">10</div>
-  <div class="box size11">11</div>
-  <div class="box size21">12</div>
-  <div class="box size12">13</div>
-  <div class="box size21">14</div>
-  <div class="box size23">15</div>
-  <div class="box size22">16</div>
-  <div class="box size11">17</div>
-  <div class="box size21">18</div>
-  <div class="box size12">19</div>
-  <div class="box size21">20</div>
-  <div class="box size22">21</div>
-  <div class="box size23">22</div>
-  <div class="box size11">23</div>
-  <div class="box size21">24</div>
-  <div class="box size12">25</div>
-  <div class="box size21">26</div>
-  <div class="box size22">27</div>
-  <div class="box size22">28</div>
-    <div class="box size11">1</div>
-  <div class="box size21">2</div>
-  <div class="box size32">3</div>
-  <div class="box size11">4</div>
-  <div class="box size21">5</div>
-  <div class="box size12">6</div>
-  <div class="box size21">7</div>
-  <div class="box size11">8</div>
-  <div class="box size31">9</div>
-  <div class="box size22">10</div>
-  <div class="box size11">11</div>
-  <div class="box size21">12</div>
-  <div class="box size12">13</div>
-  <div class="box size21">14</div>
-  <div class="box size23">15</div>
-  <div class="box size22">16</div>
-  <div class="box size11">17</div>
-  <div class="box size21">18</div>
-  <div class="box size12">19</div>
-  <div class="box size21">20</div>
-  <div class="box size22">21</div>
-  <div class="box size23">22</div>
-  <div class="box size11">23</div>
-  <div class="box size21">24</div>
-  <div class="box size12">25</div>
-  <div class="box size21">26</div>
-  <div class="box size22">27</div>
-  <div class="box size22">28</div>
-    <div class="box size11">1</div>
-  <div class="box size21">2</div>
-  <div class="box size32">3</div>
-  <div class="box size11">4</div>
-  <div class="box size21">5</div>
-  <div class="box size12">6</div>
-  <div class="box size21">7</div>
-  <div class="box size11">8</div>
-  <div class="box size31">9</div>
-  <div class="box size22">10</div>
-  <div class="box size11">11</div>
-  <div class="box size21">12</div>
-  <div class="box size12">13</div>
-  <div class="box size21">14</div>
-  <div class="box size23">15</div>
-  <div class="box size22">16</div>
-  <div class="box size11">17</div>
-  <div class="box size21">18</div>
-  <div class="box size12">19</div>
-  <div class="box size21">20</div>
-  <div class="box size22">21</div>
-  <div class="box size23">22</div>
-  <div class="box size11">23</div>
-  <div class="box size21">24</div>
-  <div class="box size12">25</div>
-  <div class="box size21">26</div>
-  <div class="box size22">27</div>
-  <div class="box size22">28</div>
-    <div class="box size11">1</div>
-  <div class="box size21">2</div>
-  <div class="box size32">3</div>
-  <div class="box size11">4</div>
-  <div class="box size21">5</div>
-  <div class="box size12">6</div>
-  <div class="box size21">7</div>
-  <div class="box size11">8</div>
-  <div class="box size31">9</div>
-  <div class="box size22">10</div>
-  <div class="box size11">11</div>
-  <div class="box size21">12</div>
-  <div class="box size12">13</div>
-  <div class="box size21">14</div>
-  <div class="box size23">15</div>
-  <div class="box size22">16</div>
-  <div class="box size11">17</div>
-  <div class="box size21">18</div>
-  <div class="box size12">19</div>
-  <div class="box size21">20</div>
-  <div class="box size22">21</div>
-  <div class="box size23">22</div>
-  <div class="box size11">23</div>
-  <div class="box size21">24</div>
-  <div class="box size12">25</div>
-  <div class="box size21">26</div>
-  <div class="box size22">27</div>
-  <div class="box size22">28</div>
-  <div class="box size11">1</div>
-  <div class="box size21">2</div>
-  <div class="box size32">3</div>
-  <div class="box size11">4</div>
-  <div class="box size21">5</div>
-  <div class="box size12">6</div>
-  <div class="box size21">7</div>
-  <div class="box size11">8</div>
-  <div class="box size31">9</div>
-  <div class="box size22">10</div>
-  <div class="box size11">11</div>
-  <div class="box size21">12</div>
-  <div class="box size12">13</div>
-  <div class="box size21">14</div>
-  <div class="box size23">15</div>
-  <div class="box size22">16</div>
-  <div class="box size11">17</div>
-  <div class="box size21">18</div>
-  <div class="box size12">19</div>
-  <div class="box size21">20</div>
-  <div class="box size22">21</div>
-  <div class="box size23">22</div>
-  <div class="box size11">23</div>
-  <div class="box size21">24</div>
-  <div class="box size12">25</div>
-  <div class="box size21">26</div>
-  <div class="box size22">27</div>
-  <div class="box size22">28</div>
- --> 
-  
 </div>
 
 <script type="text/javascript" >
   $(function() { 
-   // $('#firstbox').nested(); 
+    $('#firstbox').nested(); 
     $('#secondbox').nested(); 
     
     $('#prepend').click(function(){
diff --git a/jquery.nested.js b/jquery.nested.js
index 2433dca..1496cde 100644
--- a/jquery.nested.js
+++ b/jquery.nested.js
@@ -48,14 +48,14 @@
         selector: '.box',
         minWidth: 50,
         minColumns: 1,
-        gutter: 10,
+        gutter: 1,
         resizeToFit: true, // will resize block bigger than the gap
         resizeToFitOptions: {
             resizeAny: true // will resize any block to fit the gap         
         },
         animate: true,
         animationOptions: {
-            speed: 100,
+            speed: 50,
             duration: 200,
             queue: true,
             complete: function () {}
@@ -94,7 +94,7 @@
             this.matrix = {};
             this.gridrow = new Object;
             this.columns = Math.max(this.options.minColumns, parseInt(this.box.innerWidth() / (this.options.minWidth + this.options.gutter)) + 1);
-
+            
             // build columns
             var minWidth = this.options.minWidth;
             var gutter = this.options.gutter;
@@ -271,6 +271,8 @@
             }
        
             while(true) {             
+                
+                
                 for(var y = col; y >= 0; y--) {
                     if(this.gridrow[gridy + y]) break;
                     this.gridrow[gridy + y] = new Object;
@@ -278,6 +280,7 @@
                         this.gridrow[gridy + y][x] = false;
                     }
                 }
+                
                 for(var column = 0; column < (this.columns - col); column++) {
 
                     // Add default empty matrix, used to calculate and update matrix for each box
@@ -288,19 +291,24 @@
 
                     for(var y = 0; y < row; y++) {
                         for(var x = 0; x < col; x++) {
+                            
+                            if(!this.gridrow[gridy + y]) { break; }
+                            
                             if(this.gridrow[gridy + y][column + x]) {
                                 fits = false;
                                 break;
                             }
+                        }
                             if(!fits) {
                                 break;
                             }
-                        }
                     }
                     if(fits) {
                         // Set as taken
                         for(var y = 0; y < row; y++) {
                             for(var x = 0; x < col; x++) {
+                                
+                                if(!this.gridrow[gridy + y]) { break; }
                                 this.gridrow[gridy + y][column + x] = true;
                             }
                         }                      
@@ -367,14 +375,14 @@
             var t = 0;
 
             $.each($els, function (index, value) {
-                            
+                                     
                 $currLeft = $(value['$el']).offset().left;
                 $currTop = $(value['$el']).offset().top;
                 $currWidth = $(value['$el']).width();
                 $currHeight = $(value['$el']).width();
                 
                 if($currTop < 1) {
-                  $currTop = value['y'];
+                  //$currTop = value['y'];
                 }
                 
                 value['$el'].attr('data-y', $currTop).attr('data-x', $currLeft);                
diff --git a/style.css b/style.css
index d90c4ea..8e5e504 100644
--- a/style.css
+++ b/style.css
@@ -4,23 +4,19 @@ body {	background-color:#e1e1e1;
 				font-size:11px;
 				line-height: 14px;
 				padding:0px;
-				margin:1px;	
+				margin:0px;	
 				}
 
-a {	color:#333333; text-decoration:none; }
-
-a:hover	{ color:#666666; text-decoration:none; }
 
 .box { 	background-color:#ff4499;
 				-moz-border-radius:3px;
-  				-khtml-border-radius: 3px;
+  		  -khtml-border-radius: 3px;
 				-webkit-border-radius:3px;
 				border-radius:3px;
-				position:absolute;	}
+				}
 			
 #firstbox { background: red; }
-#secondbox { background: blue }
+#secondbox { background: yellow }
 
-/*.size21, .size22, .size23, .twocols { background: #ccc }
-.size31, .size32, .size33, .threecols { background: #ff3333 }
-*/
\ No newline at end of file
+.size21, .size22, .size23, .twocols { background: #ccc }
+.size31, .size32, .size33, .threecols { background: #ff9999 }
\ No newline at end of file