Merge branch 'master' into gh-pages

desandro · Apr 30, 2012 · d67f9b1 · d67f9b1
2 parents 7c0c303 + ea57e8c
commit d67f9b1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/_posts/docs/2011-05-02-options.mdown b/_posts/docs/2011-05-02-options.mdown
@@ -76,7 +76,7 @@ $('#container').masonry({
 ## containerStyle
 
 <dl class="clearfix">
-  <dt><code>columnWidth</code></dt>
+  <dt><code>containerStyle</code></dt>
   <dd class="option-type">Object</dd>
   <dd class="default"><code>{ position: <span class="s1">'relative'</span> }</code></dd>
 </dl>

diff --git a/jquery.masonry.js b/jquery.masonry.js
@@ -1,5 +1,5 @@
 /**
- * jQuery Masonry v2.1.04
+ * jQuery Masonry v2.1.05
  * A dynamic layout plugin for jQuery
  * The flip-side of CSS Floats
  * http://masonry.desandro.com
@@ -243,8 +243,7 @@
           colSpan, groupCount, groupY, groupColY, j;
 
       //how many columns does this brick span
-      colSpan = Math.ceil( $brick.outerWidth(true) /
-        ( this.columnWidth + this.options.gutterWidth ) );
+      colSpan = Math.ceil( $brick.outerWidth(true) / this.columnWidth );
       colSpan = Math.min( colSpan, this.cols );
 
       if ( colSpan === 1 ) {

diff --git a/jquery.masonry.min.js b/jquery.masonry.min.js