diff --git a/_layouts/elements.html b/_layouts/elements.html
index 69aba03..8ca7dd0 100644
--- a/_layouts/elements.html
+++ b/_layouts/elements.html
@@ -54,46 +54,44 @@
   <script src="../{{ site.isotope_js }}"></script>
   <script src="../js/fake-element.js"></script>
   <script>
+    $(function(){
+      
+      var $container = $('#container');
+
+      $('#filters').find('a').click(function(){
+        // get href attribute, minus the #, plus a . to make it a class
+        var filterName = '.' + $(this).attr('href').slice(1);
+        filterName = filterName === '.show-all' ? '*' : filterName;
+        $container.isotope({ filter: filterName })
+        return false;
+      });
 
-    var $container = $('#container');
-
-    $('#filters').find('a').click(function(){
-      // get href attribute, minus the #, plus a . to make it a class
-      var filterName = '.' + $(this).attr('href').slice(1);
-      filterName = filterName === '.show-all' ? '*' : filterName;
-      $container.isotope({ filter: filterName })
-      return false;
-    });
-
-    {% include sort-buttons.js %}
-
-    // change size of clicked element
-    $container.find('.element').live('click', function(){
-      $(this).toggleClass('large');
-      $container.isotope('reLayout');
-    });
+      {% include sort-buttons.js %}
 
-    // toggle variable sizes of all elements
-    $('#toggle-sizes').find('a').click(function(){
-      $container
-        .toggleClass('variable-sizes')
-        .isotope('reLayout');
-      return false;
-    });
+      // change size of clicked element
+      $container.find('.element').live('click', function(){
+        $(this).toggleClass('large');
+        $container.isotope('reLayout');
+      });
 
-    {% include layout-change.js %}
+      // toggle variable sizes of all elements
+      $('#toggle-sizes').find('a').click(function(){
+        $container
+          .toggleClass('variable-sizes')
+          .isotope('reLayout');
+        return false;
+      });
 
-    {% include add-buttons.js %}
+      {% include layout-change.js %}
 
-    $('#shuffle a').click(function(){
-      $container.isotope('shuffle');
-      return false;
-    });
+      {% include add-buttons.js %}
 
-    {% include option-buttons.js %}
-    
+      $('#shuffle a').click(function(){
+        $container.isotope('shuffle');
+        return false;
+      });
 
-    $(function(){
+      {% include option-buttons.js %}
 
       $container.isotope({
         itemSelector : '.element',
diff --git a/_posts/demos/2010-12-29-layout-modes.html b/_posts/demos/2010-12-29-layout-modes.html
index e6580f3..03e5cea 100644
--- a/_posts/demos/2010-12-29-layout-modes.html
+++ b/_posts/demos/2010-12-29-layout-modes.html
@@ -25,14 +25,13 @@ related: layouts
   <script src="../{{ site.jquery_js }}"></script>
   <script src="../{{ site.isotope_js }}"></script>
   <script>
-  
-    var $container = $('#container');
+    $(function(){
+      
+      var $container = $('#container');
 
-    {% include layout-change.js %}
-    
-    {% include option-buttons.js %}
+      {% include layout-change.js %}
 
-    $(function(){
+      {% include option-buttons.js %}
 
       $container.isotope({
         itemSelector : '.element',
diff --git a/_posts/demos/2010-12-30-filtering.html b/_posts/demos/2010-12-30-filtering.html
index 3da295f..cec188d 100644
--- a/_posts/demos/2010-12-30-filtering.html
+++ b/_posts/demos/2010-12-30-filtering.html
@@ -39,19 +39,18 @@ related: filtering
   <script src="../{{ site.jquery_js }}"></script>
   <script src="../{{ site.isotope_js }}"></script>
   <script>
-  
-    var $container = $('#container');
+    $(function(){
+      
+      var $container = $('#container');
 
-    // filter buttons
-    $('#filters a').click(function(){
-      var selector = $(this).attr('data-filter');
-      $container.isotope({ filter: selector });
-      return false;
-    });
-    
-    {% include option-buttons.js %}
+      // filter buttons
+      $('#filters a').click(function(){
+        var selector = $(this).attr('data-filter');
+        $container.isotope({ filter: selector });
+        return false;
+      });
 
-    $(function(){
+      {% include option-buttons.js %}
 
       $container.isotope({
         itemSelector : '.element'
diff --git a/_posts/demos/2010-12-30-sorting.html b/_posts/demos/2010-12-30-sorting.html
index a64bc25..d1a84ac 100644
--- a/_posts/demos/2010-12-30-sorting.html
+++ b/_posts/demos/2010-12-30-sorting.html
@@ -26,15 +26,14 @@ related: sorting
   <script src="../{{ site.jquery_js }}"></script>
   <script src="../{{ site.isotope_js }}"></script>
   <script>
-
-    var $container = $('#container');
-    
-    {% include sort-buttons.js %}
-    
-    {% include option-buttons.js %}
-  
     $(function(){
       
+      var $container = $('#container');
+
+      {% include sort-buttons.js %}
+
+      {% include option-buttons.js %}
+      
       $container.isotope({
         itemSelector : '.element',
         getSortData : {
diff --git a/_posts/demos/2010-12-31-relayout.html b/_posts/demos/2010-12-31-relayout.html
index b903eac..bc2ac1a 100644
--- a/_posts/demos/2010-12-31-relayout.html
+++ b/_posts/demos/2010-12-31-relayout.html
@@ -25,26 +25,24 @@ related: methods
   <script src="../{{ site.jquery_js }}"></script>
   <script src="../{{ site.isotope_js }}"></script>
   <script>
-  
-    var $container = $('#container');
-  
-    // toggle variable sizes of all elements
-    $('#toggle-sizes a').click(function(){
-      $container
-        .toggleClass('variable-sizes')
-        .isotope('reLayout');
-      return false;
-    });
-  
-    // change size of clicked element
-    $container.find('.element').live('click', function(){
-      $(this).toggleClass('large');
-      $container.isotope('reLayout');
-    });
-  
-  
     $(function(){
       
+      var $container = $('#container');
+
+      // toggle variable sizes of all elements
+      $('#toggle-sizes a').click(function(){
+        $container
+          .toggleClass('variable-sizes')
+          .isotope('reLayout');
+        return false;
+      });
+
+      // change size of clicked element
+      $container.find('.element').live('click', function(){
+        $(this).toggleClass('large');
+        $container.isotope('reLayout');
+      });
+      
       $container.isotope({
         itemSelector: '.element',
         masonry : {
diff --git a/_posts/demos/2011-01-02-adding-items.html b/_posts/demos/2011-01-02-adding-items.html
index 8412211..34776dd 100644
--- a/_posts/demos/2011-01-02-adding-items.html
+++ b/_posts/demos/2011-01-02-adding-items.html
@@ -31,22 +31,21 @@ related: methods
   <script src="../{{ site.isotope_js }}"></script>
   <script src="../js/fake-element.js"></script>
   <script>
+    $(function(){
+      
+      var $container = $('#container');
 
-    var $container = $('#container');
+      {% include add-buttons.js %}
 
-    {% include add-buttons.js %}
+      $('#prepend a').click(function(){
+        var $newEls = $( fakeElement.getGroup() );
+        $container
+          .prepend( $newEls ).isotope('reloadItems').isotope({ sortBy: 'original-order' })
+          // set sort back to symbol for inserting
+          .isotope('option', { sortBy: 'symbol' });
 
-    $('#prepend a').click(function(){
-      var $newEls = $( fakeElement.getGroup() );
-      $container
-        .prepend( $newEls ).isotope('reloadItems').isotope({ sortBy: 'original-order' })
-        // set sort back to symbol for inserting
-        .isotope('option', { sortBy: 'symbol' });
-      
-      return false;
-    });
-
-    $(function(){
+        return false;
+      });
 
       $container.isotope({
         itemSelector : '.element',
diff --git a/_posts/demos/2011-03-29-combination-filters.html b/_posts/demos/2011-03-29-combination-filters.html
index 98d45c7..9e0ff90 100644
--- a/_posts/demos/2011-03-29-combination-filters.html
+++ b/_posts/demos/2011-03-29-combination-filters.html
@@ -57,31 +57,30 @@ schema:
 <script src="../{{ site.jquery_js }}"></script>
 <script src="../{{ site.isotope_js }}"></script>
 <script>
+  $(function(){
+    
+    var $container = $('#container'),
+        filters = {};
 
-  var $container = $('#container'),
-      filters = {};
+    // filter buttons
+    $('.filter a').click(function(){
+      var $this = $(this),
+          isoFilters = [],
+          prop, selector;
+      // store filter value in object
+      // i.e. filters.color = 'red'
+      filters[ $this.data('group') ] = $this.data('filter');
 
-  // filter buttons
-  $('.filter a').click(function(){
-    var $this = $(this),
-        isoFilters = [],
-        prop, selector;
-    // store filter value in object
-    // i.e. filters.color = 'red'
-    filters[ $this.data('group') ] = $this.data('filter');
-    
-    for ( prop in filters ) {
-      isoFilters.push( filters[ prop ] )
-    }
-    selector = isoFilters.join('');
-    $container.isotope({ filter: selector });
+      for ( prop in filters ) {
+        isoFilters.push( filters[ prop ] )
+      }
+      selector = isoFilters.join('');
+      $container.isotope({ filter: selector });
 
-    return false;
-  });
-  
-  {% include option-buttons.js %}
+      return false;
+    });
 
-  $(function(){
+    {% include option-buttons.js %}
 
     $container.isotope({
       itemSelector : '.color-shape',
diff --git a/_posts/tests/2011-05-24-elements-complete-test.html b/_posts/tests/2011-05-24-elements-complete-test.html
new file mode 100644
index 0000000..eb13c8b
--- /dev/null
+++ b/_posts/tests/2011-05-24-elements-complete-test.html
@@ -0,0 +1,160 @@
+---
+title: elements complete test
+layout: demo
+category: tests
+---
+
+<section id="copy">
+  <p>Isotope&rsquo;s capabilities are designed to be used together cohesively. You can do it all &mdash; filter, sort, change layout modes, add items &mdash; and Isotope will handle it with ease.</p>
+</section>
+
+<section id="options" class="clearfix">
+
+  <h3>Filters</h3>
+
+  <ul id="filters" class="option-set floated clearfix">
+    <li><a href="#show-all" class="selected">show all</a></li>
+    <li><a href="#metalloid">metalloid</a></li>
+    <li><a href="#metal">metal</a></li>
+    <li><a href="#alkali">alkali</a></li>
+    <li><a href="#alkaline-earth">alkaline-earth</a></li>
+    <li><a href="#inner-transition">inner-transition</a></li>
+    <li><a href="#lanthanoid">lanthanoid</a></li>
+    <li><a href="#actinoid">actinoid</a></li>
+    <li><a href="#transition">transition</a></li>
+    <li><a href="#post-transition">post-transition</a></li>
+    <li><a href="#nonmetal">nonmetal</a></li>
+    <li><a href="#other">other</a></li>
+    <li><a href="#halogen">halogen</a></li>
+    <li><a href="#noble-gas">noble-gas</a></li>
+  </ul>
+
+  {% include sort-buttons.html %}
+
+  {% include layout-options.html %}
+
+  <h3>Etc</h3>
+
+  <ul id="etc" class="floated clearfix">
+
+    <li id="toggle-sizes"><a href="#toggle-sizes">Toggle variable sizes</a></li>
+    <li id="insert"><a href="#insert">Insert new elements</a></li>
+    <li id="append"><a href='#append'>Append new elements</a></li>
+    <!-- <li id="shuffle"><a href='#shuffle'>Shuffle</a></li> -->
+  </ul>
+</section> <!-- #options -->
+
+
+<div id="container" class="clickable clearfix">
+  {% for elem_number in site.random_order %}
+    {% assign element = site.elements[elem_number] %}
+    {% include element-partial.html %}
+  {% endfor %}
+</div>
+
+
+<script src="../{{ site.jquery_js }}"></script>
+<script src="../{{ site.isotope_js }}"></script>
+<script src="../js/fake-element.js"></script>
+<script>
+
+  var $container = $('#container');
+
+  $('#filters').find('a').click(function(){
+    console.time('filter');
+    // get href attribute, minus the #, plus a . to make it a class
+    var filterName = '.' + $(this).attr('href').slice(1);
+    filterName = filterName === '.show-all' ? '*' : filterName;
+    $container.isotope({ filter: filterName })
+    
+    console.timeEnd('filter');
+    return false;
+  });
+
+  // sorting
+  $('#sort a').click(function(){
+    console.time('sort');
+    // get href attribute, minus the #
+    var $this = $(this),
+        sortName = $this.attr('href').slice(1),
+        asc = $this.parents('.sort').hasClass('asc');
+    $container.isotope({ 
+      sortBy : sortName,
+      sortAscending : asc
+    });
+    console.timeEnd('sort');
+    return false;
+  });
+
+  // change size of clicked element
+  $container.find('.element').live('click', function(){
+    $(this).toggleClass('large');
+    $container.isotope('reLayout');
+  });
+
+  // toggle variable sizes of all elements
+  $('#toggle-sizes').find('a').click(function(){
+    $container
+      .toggleClass('variable-sizes')
+      .isotope('reLayout');
+    return false;
+  });
+
+  {% include layout-change.js %}
+
+  {% include add-buttons.js %}
+
+  $('#shuffle a').click(function(){
+    $container.isotope('shuffle');
+    return false;
+  });
+
+  {% include option-buttons.js %}
+  
+
+  $(function(){
+
+    console.time('init');
+    $container.isotope({
+      itemSelector : '.element',
+      // layoutMode : 'fitRows',
+      masonry : {
+        columnWidth : 120
+      },
+      masonryHorizontal : {
+        rowHeight: 120
+      },
+      cellsByRow : {
+        columnWidth : 240,
+        rowHeight : 240
+      },
+      cellsByColumn : {
+        columnWidth : 240,
+        rowHeight : 240
+      },
+      animationEngine : $.browser.opera ? 'jquery' : 'best-available',
+      // animationEngine : 'jquery',
+      getSortData : {
+        symbol : function( $elem ) {
+          return $elem.attr('data-symbol');
+        },
+        category : function( $elem ) {
+          return $elem.attr('data-category');
+        },
+        number : function( $elem ) {
+          return parseInt( $elem.find('.number').text(), 10 );
+        },
+        weight : function( $elem ) {
+          return parseFloat( $elem.find('.weight').text().replace( /[\(\)]/g, '') );
+        },
+        name : function ( $elem ) {
+          return $elem.find('.name').text();
+        }
+      }
+    });
+    
+    console.timeEnd('init');
+
+
+  });
+</script>
diff --git a/jquery.isotope.js b/jquery.isotope.js
index df9c89a..4561996 100644
--- a/jquery.isotope.js
+++ b/jquery.isotope.js
@@ -1,5 +1,5 @@
 /**
- * Isotope v1.3.110524
+ * Isotope v1.3.110525
  * An exquisite jQuery plugin for magical layouts
  * http://isotope.metafizzy.co
  *
@@ -179,9 +179,8 @@
     ;
 
     var setIsoTransform = function ( elem, name, value ) {
-      var $elem = $(elem),
           // unpack current transform data
-          data =  $elem.data('isoTransform') || {},
+      var data =  $.data( elem, 'isoTransform' ) || {},
           newData = {},
           fnName,
           transformObj = {},
@@ -206,7 +205,7 @@
           valueFns = translateFn + scaleFn;
 
       // set data back in elem
-      $elem.data( 'isoTransform', data );
+      $.data( elem, 'isoTransform', data );
 
       // set name to vendor specific property
       elem.style[ transformProp ] = valueFns;
@@ -438,13 +437,12 @@
 
     },
 
-    option: function( key, value ){
+    option : function( opts ){
       // change options AFTER initialization:
       // signature: $('#foo').bar({ cool:false });
-      if ( $.isPlainObject( key ) ){
-        this.options = $.extend(true, this.options, key);
-        var optionName;
-        for ( optionName in key ) {
+      if ( $.isPlainObject( opts ) ){
+        this.options = $.extend( true, this.options, opts );
+        for ( var optionName in opts ) {
           this._updateOption( optionName );
         }
       }
@@ -535,8 +533,8 @@
         for ( var key in getSortData ) {
           sortData[ key ] = getSortData[ key ]( $this, instance );
         }
-        // apply sort data to $element
-        $this.data( 'isotope-sort-data', sortData );
+        // apply sort data to element
+        $.data( this, 'isotope-sort-data', sortData );
         if ( isIncrementingElemCount ) {
           instance.elemCount ++;
         }
@@ -564,7 +562,7 @@
     },
 
     _getSorter : function( elem, sortBy ) {
-      return $(elem).data('isotope-sort-data')[ sortBy ];
+      return $.data( elem, 'isotope-sort-data' )[ sortBy ];
     },
 
     // ====================== Layout Helpers ======================
@@ -765,19 +763,18 @@
           size     = isRows ? 'height' : 'width',
           UCSize   = isRows ? 'Height' : 'Width',
           segmentsName = isRows ? 'rows' : 'cols',
+          containerSize = this.element[ size ](),
           segments,
           segmentSize;
       
-      this[ size ] = this.element[ size ]();
-      
                     // i.e. options.masonry && options.masonry.columnWidth
       segmentSize = this.options[ namespace ] && this.options[ namespace ][ measure ] ||
                     // or use the size of the first item
                     this.$filteredAtoms[ 'outer' + UCSize ](true) ||
                     // if there's no items, use size of container
-                    this[ size ];
+                    containerSize;
       
-      segments = Math.floor( this[ size ] / segmentSize );
+      segments = Math.floor( containerSize / segmentSize );
       segments = Math.max( segments, 1 );
 
       // i.e. this.masonry.cols = ....
@@ -812,20 +809,21 @@
     },
   
     _masonryLayout : function( $elems ) {
-      var instance = this;
+      var instance = this,
+          props = instance.masonry;
       $elems.each(function(){
         var $this  = $(this),
             //how many columns does this brick span
-            colSpan = Math.ceil( $this.outerWidth(true) / instance.masonry.columnWidth );
-        colSpan = Math.min( colSpan, instance.masonry.cols );
+            colSpan = Math.ceil( $this.outerWidth(true) / props.columnWidth );
+        colSpan = Math.min( colSpan, props.cols );
 
         if ( colSpan === 1 ) {
           // if brick spans only one column, just like singleMode
-          instance._masonryPlaceBrick( $this, instance.masonry.colYs );
+          instance._masonryPlaceBrick( $this, props.colYs );
         } else {
           // brick spans more than one column
           // how many different places could this brick fit horizontally
-          var groupCount = instance.masonry.cols + 1 - colSpan,
+          var groupCount = props.cols + 1 - colSpan,
               groupY = [],
               groupColY,
               i;
@@ -833,7 +831,7 @@
           // for each group potential horizontal position
           for ( i=0; i < groupCount; i++ ) {
             // make an array of colY values for that one group
-            groupColY = instance.masonry.colYs.slice( i, i+colSpan );
+            groupColY = props.colYs.slice( i, i+colSpan );
             // and get the max value of the array
             groupY[i] = Math.max.apply( Math, groupColY );
           }
@@ -846,17 +844,15 @@
     // worker method that places brick in the columnSet
     //   with the the minY
     _masonryPlaceBrick : function( $brick, setY ) {
-          // get the minimum Y value from the columns
-      var minimumY  = Math.min.apply( Math, setY ),
-          setHeight = minimumY + $brick.outerHeight(true),
-          i         = setY.length,
-          shortCol  = i,
-          setSpan   = this.masonry.cols + 1 - i,
-          x, y ;
-      // Which column has the minY value, closest to the left
-      while (i--) {
+      // get the minimum Y value from the columns
+      var minimumY = Math.min.apply( Math, setY ),
+          shortCol = 0;
+
+      // Find index of short column, the first from the left
+      for (var i=0, len = setY.length; i < len; i++) {
         if ( setY[i] === minimumY ) {
           shortCol = i;
+          break;
         }
       }
     
@@ -866,6 +862,8 @@
       this._pushPosition( $brick, x, y );
 
       // apply setHeight to necessary columns
+      var setHeight = minimumY + $brick.outerHeight(true),
+          setSpan = this.masonry.cols + 1 - len;
       for ( i=0; i < setSpan; i++ ) {
         this.masonry.colYs[ shortCol + i ] = setHeight;
       }
@@ -892,8 +890,9 @@
     },
   
     _fitRowsLayout : function( $elems ) {
-      this.width = this.element.width();
-      var instance = this;
+      var instance = this,
+          containerWidth = this.element.width(),
+          props = this.fitRows;
       
       $elems.each( function() {
         var $this = $(this),
@@ -901,19 +900,17 @@
             atomH = $this.outerHeight(true),
             x, y;
       
-        if ( instance.fitRows.x !== 0  &&  atomW + instance.fitRows.x > instance.width ) {
+        if ( props.x !== 0 && atomW + props.x > containerWidth ) {
           // if this element cannot fit in the current row
-          instance.fitRows.x = 0;
-          instance.fitRows.y = instance.fitRows.height;
+          props.x = 0;
+          props.y = props.height;
         } 
       
         // position the atom
-        x = instance.fitRows.x;
-        y = instance.fitRows.y;
-        instance._pushPosition( $this, x, y );
+        instance._pushPosition( $this, props.x, props.y );
   
-        instance.fitRows.height = Math.max( instance.fitRows.y + atomH, instance.fitRows.height );
-        instance.fitRows.x += atomW;
+        props.height = Math.max( props.y + atomH, props.height );
+        props.x += atomW;
   
       });
     },
@@ -946,10 +943,8 @@
         var $this = $(this),
             col = props.index % props.cols,
             row = ~~( props.index / props.cols ),
-            x = ( col + 0.5 ) * props.columnWidth -
-                  $this.outerWidth(true) / 2,
-            y = ( row + 0.5 ) * props.rowHeight -
-                  $this.outerHeight(true) / 2;
+            x = ( col + 0.5 ) * props.columnWidth - $this.outerWidth(true) / 2,
+            y = ( row + 0.5 ) * props.rowHeight - $this.outerHeight(true) / 2;
         instance._pushPosition( $this, x, y );
         props.index ++;
       });
@@ -1005,27 +1000,28 @@
     },
   
     _masonryHorizontalLayout : function( $elems ) {
-      var instance = this;
+      var instance = this,
+          props = instance.masonryHorizontal;
       $elems.each(function(){
         var $this  = $(this),
             //how many rows does this brick span
-            rowSpan = Math.ceil( $this.outerHeight(true) / instance.masonryHorizontal.rowHeight );
-        rowSpan = Math.min( rowSpan, instance.masonryHorizontal.rows );
+            rowSpan = Math.ceil( $this.outerHeight(true) / props.rowHeight );
+        rowSpan = Math.min( rowSpan, props.rows );
 
         if ( rowSpan === 1 ) {
           // if brick spans only one column, just like singleMode
-          instance._masonryHorizontalPlaceBrick( $this, instance.masonryHorizontal.rowXs );
+          instance._masonryHorizontalPlaceBrick( $this, props.rowXs );
         } else {
           // brick spans more than one row
           // how many different places could this brick fit horizontally
-          var groupCount = instance.masonryHorizontal.rows + 1 - rowSpan,
+          var groupCount = props.rows + 1 - rowSpan,
               groupX = [],
               groupRowX, i;
 
           // for each group potential horizontal position
           for ( i=0; i < groupCount; i++ ) {
             // make an array of colY values for that one group
-            groupRowX = instance.masonryHorizontal.rowXs.slice( i, i+rowSpan );
+            groupRowX = props.rowXs.slice( i, i+rowSpan );
             // and get the max value of the array
             groupX[i] = Math.max.apply( Math, groupRowX );
           }
@@ -1036,18 +1032,14 @@
     },
     
     _masonryHorizontalPlaceBrick : function( $brick, setX ) {
-      // here, `this` refers to a child element or "brick"
-          // get the minimum Y value from the columns
+      // get the minimum Y value from the columns
       var minimumX  = Math.min.apply( Math, setX ),
-          setWidth  = minimumX + $brick.outerWidth(true),
-          i         = setX.length,
-          smallRow  = i,
-          setSpan   = this.masonryHorizontal.rows + 1 - i,
-          x, y ;
-      // Which column has the minY value, closest to the left
-      while (i--) {
+          smallRow  = 0;
+      // Find index of smallest row, the first from the top
+      for (var i=0, len = setX.length; i < len; i++) {
         if ( setX[i] === minimumX ) {
           smallRow = i;
+          break;
         }
       }
 
@@ -1057,10 +1049,11 @@
       this._pushPosition( $brick, x, y );
 
       // apply setHeight to necessary columns
+      var setWidth = minimumX + $brick.outerWidth(true),
+          setSpan = this.masonryHorizontal.rows + 1 - len;
       for ( i=0; i < setSpan; i++ ) {
         this.masonryHorizontal.rowXs[ smallRow + i ] = setWidth;
       }
-
     },
 
     _masonryHorizontalGetContainerSize : function() {
@@ -1084,27 +1077,26 @@
     },
     
     _fitColumnsLayout : function( $elems ) {
-      var instance = this;
-      this.height = this.element.height();
+      var instance = this,
+          containerHeight = this.element.height(),
+          props = this.fitColumns;
       $elems.each( function() {
         var $this = $(this),
             atomW = $this.outerWidth(true),
             atomH = $this.outerHeight(true),
             x, y;
 
-        if ( instance.fitColumns.y !== 0  &&  atomH + instance.fitColumns.y > instance.height ) {
+        if ( props.y !== 0 && atomH + props.y > containerHeight ) {
           // if this element cannot fit in the current column
-          instance.fitColumns.x = instance.fitColumns.width;
-          instance.fitColumns.y = 0;
+          props.x = props.width;
+          props.y = 0;
         } 
 
         // position the atom
-        x = instance.fitColumns.x;
-        y = instance.fitColumns.y;
-        instance._pushPosition( $this, x, y );
+        instance._pushPosition( $this, props.x, props.y );
 
-        instance.fitColumns.width = Math.max( instance.fitColumns.x + atomW, instance.fitColumns.width );
-        instance.fitColumns.y += atomH;
+        props.width = Math.max( props.x + atomW, props.width );
+        props.y += atomH;
 
       });
     },
@@ -1245,7 +1237,7 @@
         var instance = $.data( this, 'isotope' );
         if ( instance ) {
           // apply options & init
-          instance.option( options || {} );
+          instance.option( options );
           instance._init();
         } else {
           // initialize new instance
diff --git a/jquery.isotope.min.js b/jquery.isotope.min.js
index a4d0f1b..ba1ed25 100644
--- a/jquery.isotope.min.js
+++ b/jquery.isotope.min.js
@@ -1,5 +1,5 @@
 /**
- * Isotope v1.3.110524
+ * Isotope v1.3.110525
  * An exquisite jQuery plugin for magical layouts
  * http://isotope.metafizzy.co
  *
@@ -8,4 +8,4 @@
  *
  * Copyright 2011 David DeSandro / Metafizzy
  */
-(function(a,b,c){var d=function(){function b(b,c){c=c||document.documentElement;var d=c.style,e;if(typeof d[b]=="string")return b;b=b.charAt(0).toUpperCase()+b.slice(1);for(var f=0,g=a.length;f<g;f++){e=a[f]+b;if(typeof d[e]=="string")return e}}var a=["Moz","Webkit","Khtml","O","Ms"];return b}(),e=d("transform"),f=document.documentElement,g=" -o- -moz- -ms- -webkit- -khtml- ".split(" "),h=[{name:"csstransforms",getResult:function(){return!!e}},{name:"csstransforms3d",getResult:function(){var a=!!d("perspective");if(a){var b=document.createElement("style"),c=document.createElement("div"),e="@media ("+g.join("transform-3d),(")+"modernizr)";b.textContent=e+"{#modernizr{height:3px}}",(document.head||document.getElementsByTagName("head")[0]).appendChild(b),c.id="modernizr",f.appendChild(c),a=c.offsetHeight===3,b.parentNode.removeChild(b),c.parentNode.removeChild(c)}return!!a}},{name:"csstransitions",getResult:function(){return!!d("transitionProperty")}}],i,j=h.length;if(a.Modernizr)for(i=0;i<j;i++){var k=h[i];Modernizr.hasOwnProperty(k.name)||Modernizr.addTest(k.name,k.getResult)}else a.Modernizr=function(){var a={_version:"1.6ish: miniModernizr for Isotope"},b=[],c,d,e;for(i=0;i<j;i++)c=h[i],d=c.getResult(),a[c.name]=d,e=(d?"":"no-")+c.name,b.push(e);f.className+=" "+b.join(" ");return a}();if(Modernizr.csstransforms){var l=Modernizr.csstransforms3d?{translate:function(a){return"translate3d("+a[0]+"px, "+a[1]+"px, 0) "},scale:function(a){return"scale3d("+a+", "+a+", 1) "}}:{translate:function(a){return"translate("+a[0]+"px, "+a[1]+"px) "},scale:function(a){return"scale("+a+") "}},m=function(a,c,d){var f=b(a),g=f.data("isoTransform")||{},h={},i,j={},k;h[c]=d,b.extend(g,h);for(i in g)k=g[i],j[i]=l[i](k);var m=j.translate||"",n=j.scale||"",o=m+n;f.data("isoTransform",g),a.style[e]=o};b.cssNumber.scale=!0,b.cssHooks.scale={set:function(a,b){typeof b=="string"&&(b=parseFloat(b)),m(a,"scale",b)},get:function(a,c){var d=b.data(a,"isoTransform");return d&&d.scale?d.scale:1}},b.fx.step.scale=function(a){b.cssHooks.scale.set(a.elem,a.now+a.unit)},b.cssNumber.translate=!0,b.cssHooks.translate={set:function(a,b){m(a,"translate",b)},get:function(a,c){var d=b.data(a,"isoTransform");return d&&d.translate?d.translate:[0,0]}}}var n=b.event,o;n.special.smartresize={setup:function(){b(this).bind("resize",n.special.smartresize.handler)},teardown:function(){b(this).unbind("resize",n.special.smartresize.handler)},handler:function(a,b){var c=this,d=arguments;a.type="smartresize",o&&clearTimeout(o),o=setTimeout(function(){jQuery.event.handle.apply(c,d)},b==="execAsap"?0:100)}},b.fn.smartresize=function(a){return a?this.bind("smartresize",a):this.trigger("smartresize",["execAsap"])},b.Isotope=function(a,c){this.element=b(c),this._create(a),this._init()};var p=["overflow","position","width","height"];b.Isotope.settings={resizable:!0,layoutMode:"masonry",containerClass:"isotope",itemClass:"isotope-item",hiddenClass:"isotope-hidden",hiddenStyle:Modernizr.csstransforms&&!b.browser.opera?{opacity:0,scale:.001}:{opacity:0},visibleStyle:Modernizr.csstransforms&&!b.browser.opera?{opacity:1,scale:1}:{opacity:1},animationEngine:b.browser.opera?"jquery":"best-available",animationOptions:{queue:!1,duration:800},sortBy:"original-order",sortAscending:!0,resizesContainer:!0,transformsEnabled:!0,itemPositionDataEnabled:!1},b.Isotope.prototype={_create:function(c){this.options=b.extend(!0,{},b.Isotope.settings,c),this.styleQueue=[],this.elemCount=0;var d=this.element[0].style;this.originalStyle={};for(var e=0,f=p.length;e<f;e++){var g=p[e];this.originalStyle[g]=d[g]||null}this.element.css({overflow:"hidden",position:"relative"}),this._updateAnimationEngine(),this._updateUsingTransforms();var h={"original-order":function(a,b){return b.elemCount}};this.options.getSortData=b.extend(this.options.getSortData,h),this.reloadItems();var i=b(document.createElement("div")).prependTo(this.element);this.offset=i.position(),i.remove();var j=this;setTimeout(function(){j.element.addClass(j.options.containerClass)},0),this.options.resizable&&b(a).bind("smartresize.isotope",function(){j.resize()})},_getAtoms:function(a){var b=this.options.itemSelector,c=b?a.filter(b).add(a.find(b)):a,d={position:"absolute"};this.usingTransforms&&(d.left=0,d.top=0),c.css(d).addClass(this.options.itemClass),this.updateSortData(c,!0);return c},_init:function(a){this.$filteredAtoms=this._filter(this.$allAtoms),this._sort(),this.reLayout(a)},option:function(a,c){if(b.isPlainObject(a)){this.options=b.extend(!0,this.options,a);var d;for(d in a)this._updateOption(d)}},_updateOption:function(a){var b="_update"+a.charAt(0).toUpperCase()+a.slice(1);this[b]&&this[b]()},_updateAnimationEngine:function(){var a=this.options.animationEngine.toLowerCase().replace(/[ _\-]/g,"");switch(a){case"css":case"none":this.isUsingJQueryAnimation=!1;break;case"jquery":this.isUsingJQueryAnimation=!0;break;default:this.isUsingJQueryAnimation=!Modernizr.csstransitions}this._updateUsingTransforms()},_updateTransformsEnabled:function(){this._updateUsingTransforms()},_updateUsingTransforms:function(){this.usingTransforms=this.options.transformsEnabled&&Modernizr.csstransforms&&Modernizr.csstransitions&&!this.isUsingJQueryAnimation,this.getPositionStyles=this.usingTransforms?this._translate:this._positionAbs},_filter:function(a){var b,c=this.options.filter===""?"*":this.options.filter;if(!c)b=a;else{var d=this.options.hiddenClass,e="."+d,f=a.not(e),g=a.filter(e),h=g;b=a.filter(c);if(c!=="*"){h=g.filter(c);var i=f.not(c).toggleClass(d);i.addClass(d),this.styleQueue.push({$el:i,style:this.options.hiddenStyle})}this.styleQueue.push({$el:h,style:this.options.visibleStyle}),h.removeClass(d)}return b},updateSortData:function(a,c){var d=this,e=this.options.getSortData,f,g;a.each(function(){f=b(this),g={};for(var a in e)g[a]=e[a](f,d);f.data("isotope-sort-data",g),c&&d.elemCount++})},_sort:function(){var a=this.options.sortBy,b=this._getSorter,c=this.options.sortAscending?1:-1,d=function(d,e){var f=b(d,a),g=b(e,a);f===g&&a!=="original-order"&&(f=b(d,"original-order"),g=b(e,"original-order"));return(f>g?1:f<g?-1:0)*c};this.$filteredAtoms.sort(d)},_getSorter:function(a,c){return b(a).data("isotope-sort-data")[c]},_translate:function(a,b){return{translate:[a,b]}},_positionAbs:function(a,b){return{left:a,top:b}},_pushPosition:function(a,b,c){b+=this.offset.left,c+=this.offset.top;var d=this.getPositionStyles(b,c);this.styleQueue.push({$el:a,style:d}),this.options.itemPositionDataEnabled&&a.data("isotope-item-position",{x:b,y:c})},layout:function(a,c){var d=this.options.layoutMode;this["_"+d+"Layout"](a);if(this.options.resizesContainer){var e=this["_"+d+"GetContainerSize"]();this.styleQueue.push({$el:this.element,style:e})}var f=this.isLaidOut?this.isUsingJQueryAnimation?"animate":"css":"css",g=this.options.animationOptions;b.each(this.styleQueue,function(a,b){b.$el[f](b.style,g)}),this.styleQueue=[],c&&c.call(a),this.isLaidOut=!0},resize:function(){this["_"+this.options.layoutMode+"ResizeChanged"]()&&this.reLayout()},reLayout:function(a){this["_"+this.options.layoutMode+"Reset"](),this.layout(this.$filteredAtoms,a)},addItems:function(a,b){var c=this._getAtoms(a);this.$allAtoms=this.$allAtoms.add(c),b&&b(c)},insert:function(a,b){this.element.append(a);var c=this;this.addItems(a,function(a){var b=c._filter(a);c.$filteredAtoms=c.$filteredAtoms.add(b)}),this._sort(),this.reLayout(b)},appended:function(a,b){var c=this;this.addItems(a,function(a){c.$filteredAtoms=c.$filteredAtoms.add(a),c.layout(a,b)})},reloadItems:function(){this.$allAtoms=this._getAtoms(this.element.children())},remove:function(a){this.$allAtoms=this.$allAtoms.not(a),this.$filteredAtoms=this.$filteredAtoms.not(a),a.remove()},_shuffleArray:function(a){var b,c,d=a.length;if(d)while(--d)c=~~(Math.random()*(d+1)),b=a[c],a[c]=a[d],a[d]=b;return a},shuffle:function(a){this.options.sortBy="shuffle",this.$allAtoms=this._shuffleArray(this.$allAtoms),this.$filteredAtoms=this._filter(this.$allAtoms),this.reLayout(a)},destroy:function(){var c=this.usingTransforms;this.$allAtoms.removeClass(this.options.hiddenClass+" "+this.options.itemClass).each(function(){this.style.position=null,this.style.top=null,this.style.left=null,this.style.opacity=null,c&&(this.style[e]=null)});var d=this.element[0].style;for(var f=0,g=p.length;f<g;f++){var h=p[f];d[h]=this.originalStyle[h]}this.element.unbind(".isotope").removeClass(this.options.containerClass).removeData("isotope"),b(a).unbind(".isotope")},_getSegments:function(a){var b=this.options.layoutMode,c=a?"rowHeight":"columnWidth",d=a?"height":"width",e=a?"Height":"Width",f=a?"rows":"cols",g,h;this[d]=this.element[d](),h=this.options[b]&&this.options[b][c]||this.$filteredAtoms["outer"+e](!0)||this[d],g=Math.floor(this[d]/h),g=Math.max(g,1),this[b][f]=g,this[b][c]=h},_checkIfSegmentsChanged:function(a){var b=this.options.layoutMode,c=a?"rows":"cols",d=this[b][c];this._getSegments(a);return this[b][c]!==d},_masonryReset:function(){this.masonry={},this._getSegments();var a=this.masonry.cols;this.masonry.colYs=[];while(a--)this.masonry.colYs.push(0)},_masonryLayout:function(a){var c=this;a.each(function(){var a=b(this),d=Math.ceil(a.outerWidth(!0)/c.masonry.columnWidth);d=Math.min(d,c.masonry.cols);if(d===1)c._masonryPlaceBrick(a,c.masonry.colYs);else{var e=c.masonry.cols+1-d,f=[],g,h;for(h=0;h<e;h++)g=c.masonry.colYs.slice(h,h+d),f[h]=Math.max.apply(Math,g);c._masonryPlaceBrick(a,f)}})},_masonryPlaceBrick:function(a,b){var c=Math.min.apply(Math,b),d=c+a.outerHeight(!0),e=b.length,f=e,g=this.masonry.cols+1-e,h,i;while(e--)b[e]===c&&(f=e);h=this.masonry.columnWidth*f,i=c,this._pushPosition(a,h,i);for(e=0;e<g;e++)this.masonry.colYs[f+e]=d},_masonryGetContainerSize:function(){var a=Math.max.apply(Math,this.masonry.colYs);return{height:a}},_masonryResizeChanged:function(){return this._checkIfSegmentsChanged()},_fitRowsReset:function(){this.fitRows={x:0,y:0,height:0}},_fitRowsLayout:function(a){this.width=this.element.width();var c=this;a.each(function(){var a=b(this),d=a.outerWidth(!0),e=a.outerHeight(!0),f,g;c.fitRows.x!==0&&d+c.fitRows.x>c.width&&(c.fitRows.x=0,c.fitRows.y=c.fitRows.height),f=c.fitRows.x,g=c.fitRows.y,c._pushPosition(a,f,g),c.fitRows.height=Math.max(c.fitRows.y+e,c.fitRows.height),c.fitRows.x+=d})},_fitRowsGetContainerSize:function(){return{height:this.fitRows.height}},_fitRowsResizeChanged:function(){return!0},_cellsByRowReset:function(){this.cellsByRow={index:0},this._getSegments(),this._getSegments(!0)},_cellsByRowLayout:function(a){var c=this,d=this.cellsByRow;a.each(function(){var a=b(this),e=d.index%d.cols,f=~~(d.index/d.cols),g=(e+.5)*d.columnWidth-a.outerWidth(!0)/2,h=(f+.5)*d.rowHeight-a.outerHeight(!0)/2;c._pushPosition(a,g,h),d.index++})},_cellsByRowGetContainerSize:function(){return{height:Math.ceil(this.$filteredAtoms.length/this.cellsByRow.cols)*this.cellsByRow.rowHeight+this.offset.top}},_cellsByRowResizeChanged:function(){return this._checkIfSegmentsChanged()},_straightDownReset:function(){this.straightDown={y:0}},_straightDownLayout:function(a){var c=this;a.each(function(a){var d=b(this);c._pushPosition(d,0,c.straightDown.y),c.straightDown.y+=d.outerHeight(!0)})},_straightDownGetContainerSize:function(){return{height:this.straightDown.y}},_straightDownResizeChanged:function(){return!0},_masonryHorizontalReset:function(){this.masonryHorizontal={},this._getSegments(!0);var a=this.masonryHorizontal.rows;this.masonryHorizontal.rowXs=[];while(a--)this.masonryHorizontal.rowXs.push(0)},_masonryHorizontalLayout:function(a){var c=this;a.each(function(){var a=b(this),d=Math.ceil(a.outerHeight(!0)/c.masonryHorizontal.rowHeight);d=Math.min(d,c.masonryHorizontal.rows);if(d===1)c._masonryHorizontalPlaceBrick(a,c.masonryHorizontal.rowXs);else{var e=c.masonryHorizontal.rows+1-d,f=[],g,h;for(h=0;h<e;h++)g=c.masonryHorizontal.rowXs.slice(h,h+d),f[h]=Math.max.apply(Math,g);c._masonryHorizontalPlaceBrick(a,f)}})},_masonryHorizontalPlaceBrick:function(a,b){var c=Math.min.apply(Math,b),d=c+a.outerWidth(!0),e=b.length,f=e,g=this.masonryHorizontal.rows+1-e,h,i;while(e--)b[e]===c&&(f=e);h=c,i=this.masonryHorizontal.rowHeight*f,this._pushPosition(a,h,i);for(e=0;e<g;e++)this.masonryHorizontal.rowXs[f+e]=d},_masonryHorizontalGetContainerSize:function(){var a=Math.max.apply(Math,this.masonryHorizontal.rowXs);return{width:a}},_masonryHorizontalResizeChanged:function(){return this._checkIfSegmentsChanged(!0)},_fitColumnsReset:function(){this.fitColumns={x:0,y:0,width:0}},_fitColumnsLayout:function(a){var c=this;this.height=this.element.height(),a.each(function(){var a=b(this),d=a.outerWidth(!0),e=a.outerHeight(!0),f,g;c.fitColumns.y!==0&&e+c.fitColumns.y>c.height&&(c.fitColumns.x=c.fitColumns.width,c.fitColumns.y=0),f=c.fitColumns.x,g=c.fitColumns.y,c._pushPosition(a,f,g),c.fitColumns.width=Math.max(c.fitColumns.x+d,c.fitColumns.width),c.fitColumns.y+=e})},_fitColumnsGetContainerSize:function(){return{width:this.fitColumns.width}},_fitColumnsResizeChanged:function(){return!0},_cellsByColumnReset:function(){this.cellsByColumn={index:0},this._getSegments(),this._getSegments(!0)},_cellsByColumnLayout:function(a){var c=this,d=this.cellsByColumn;a.each(function(){var a=b(this),e=~~(d.index/d.rows),f=d.index%d.rows,g=(e+.5)*d.columnWidth-a.outerWidth(!0)/2,h=(f+.5)*d.rowHeight-a.outerHeight(!0)/2;c._pushPosition(a,g,h),d.index++})},_cellsByColumnGetContainerSize:function(){return{width:Math.ceil(this.$filteredAtoms.length/this.cellsByColumn.rows)*this.cellsByColumn.columnWidth}},_cellsByColumnResizeChanged:function(){return this._checkIfSegmentsChanged(!0)},_straightAcrossReset:function(){this.straightAcross={x:0}},_straightAcrossLayout:function(a){var c=this;a.each(function(a){var d=b(this);c._pushPosition(d,c.straightAcross.x,0),c.straightAcross.x+=d.outerWidth(!0)})},_straightAcrossGetContainerSize:function(){return{width:this.straightAcross.x}},_straightAcrossResizeChanged:function(){return!0}},b.fn.imagesLoaded=function(a){var b=this.find("img"),d=b.length,e=this;b.length||a.call(this),b.bind("load",function(){--d<=0&&a.call(e)}).each(function(){if(this.complete||this.complete===c){var a=this.src;this.src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==",this.src=a}});return this},b.fn.isotope=function(a){if(typeof a=="string"){var c=Array.prototype.slice.call(arguments,1);this.each(function(){var d=b.data(this,"isotope");if(!d)return b.error("cannot call methods on isotope prior to initialization; attempted to call method '"+a+"'");if(!b.isFunction(d[a])||a.charAt(0)==="_")return b.error("no such method '"+a+"' for isotope instance");d[a].apply(d,c)})}else this.each(function(){var c=b.data(this,"isotope");c?(c.option(a||{}),c._init()):b.data(this,"isotope",new b.Isotope(a,this))});return this}})(window,jQuery);
+(function(a,b,c){var d=function(){function b(b,c){c=c||document.documentElement;var d=c.style,e;if(typeof d[b]=="string")return b;b=b.charAt(0).toUpperCase()+b.slice(1);for(var f=0,g=a.length;f<g;f++){e=a[f]+b;if(typeof d[e]=="string")return e}}var a=["Moz","Webkit","Khtml","O","Ms"];return b}(),e=d("transform"),f=document.documentElement,g=" -o- -moz- -ms- -webkit- -khtml- ".split(" "),h=[{name:"csstransforms",getResult:function(){return!!e}},{name:"csstransforms3d",getResult:function(){var a=!!d("perspective");if(a){var b=document.createElement("style"),c=document.createElement("div"),e="@media ("+g.join("transform-3d),(")+"modernizr)";b.textContent=e+"{#modernizr{height:3px}}",(document.head||document.getElementsByTagName("head")[0]).appendChild(b),c.id="modernizr",f.appendChild(c),a=c.offsetHeight===3,b.parentNode.removeChild(b),c.parentNode.removeChild(c)}return!!a}},{name:"csstransitions",getResult:function(){return!!d("transitionProperty")}}],i,j=h.length;if(a.Modernizr)for(i=0;i<j;i++){var k=h[i];Modernizr.hasOwnProperty(k.name)||Modernizr.addTest(k.name,k.getResult)}else a.Modernizr=function(){var a={_version:"1.6ish: miniModernizr for Isotope"},b=[],c,d,e;for(i=0;i<j;i++)c=h[i],d=c.getResult(),a[c.name]=d,e=(d?"":"no-")+c.name,b.push(e);f.className+=" "+b.join(" ");return a}();if(Modernizr.csstransforms){var l=Modernizr.csstransforms3d?{translate:function(a){return"translate3d("+a[0]+"px, "+a[1]+"px, 0) "},scale:function(a){return"scale3d("+a+", "+a+", 1) "}}:{translate:function(a){return"translate("+a[0]+"px, "+a[1]+"px) "},scale:function(a){return"scale("+a+") "}},m=function(a,c,d){var f=b.data(a,"isoTransform")||{},g={},h,i={},j;g[c]=d,b.extend(f,g);for(h in f)j=f[h],i[h]=l[h](j);var k=i.translate||"",m=i.scale||"",n=k+m;b.data(a,"isoTransform",f),a.style[e]=n};b.cssNumber.scale=!0,b.cssHooks.scale={set:function(a,b){typeof b=="string"&&(b=parseFloat(b)),m(a,"scale",b)},get:function(a,c){var d=b.data(a,"isoTransform");return d&&d.scale?d.scale:1}},b.fx.step.scale=function(a){b.cssHooks.scale.set(a.elem,a.now+a.unit)},b.cssNumber.translate=!0,b.cssHooks.translate={set:function(a,b){m(a,"translate",b)},get:function(a,c){var d=b.data(a,"isoTransform");return d&&d.translate?d.translate:[0,0]}}}var n=b.event,o;n.special.smartresize={setup:function(){b(this).bind("resize",n.special.smartresize.handler)},teardown:function(){b(this).unbind("resize",n.special.smartresize.handler)},handler:function(a,b){var c=this,d=arguments;a.type="smartresize",o&&clearTimeout(o),o=setTimeout(function(){jQuery.event.handle.apply(c,d)},b==="execAsap"?0:100)}},b.fn.smartresize=function(a){return a?this.bind("smartresize",a):this.trigger("smartresize",["execAsap"])},b.Isotope=function(a,c){this.element=b(c),this._create(a),this._init()};var p=["overflow","position","width","height"];b.Isotope.settings={resizable:!0,layoutMode:"masonry",containerClass:"isotope",itemClass:"isotope-item",hiddenClass:"isotope-hidden",hiddenStyle:Modernizr.csstransforms&&!b.browser.opera?{opacity:0,scale:.001}:{opacity:0},visibleStyle:Modernizr.csstransforms&&!b.browser.opera?{opacity:1,scale:1}:{opacity:1},animationEngine:b.browser.opera?"jquery":"best-available",animationOptions:{queue:!1,duration:800},sortBy:"original-order",sortAscending:!0,resizesContainer:!0,transformsEnabled:!0,itemPositionDataEnabled:!1},b.Isotope.prototype={_create:function(c){this.options=b.extend(!0,{},b.Isotope.settings,c),this.styleQueue=[],this.elemCount=0;var d=this.element[0].style;this.originalStyle={};for(var e=0,f=p.length;e<f;e++){var g=p[e];this.originalStyle[g]=d[g]||null}this.element.css({overflow:"hidden",position:"relative"}),this._updateAnimationEngine(),this._updateUsingTransforms();var h={"original-order":function(a,b){return b.elemCount}};this.options.getSortData=b.extend(this.options.getSortData,h),this.reloadItems();var i=b(document.createElement("div")).prependTo(this.element);this.offset=i.position(),i.remove();var j=this;setTimeout(function(){j.element.addClass(j.options.containerClass)},0),this.options.resizable&&b(a).bind("smartresize.isotope",function(){j.resize()})},_getAtoms:function(a){var b=this.options.itemSelector,c=b?a.filter(b).add(a.find(b)):a,d={position:"absolute"};this.usingTransforms&&(d.left=0,d.top=0),c.css(d).addClass(this.options.itemClass),this.updateSortData(c,!0);return c},_init:function(a){this.$filteredAtoms=this._filter(this.$allAtoms),this._sort(),this.reLayout(a)},option:function(a){if(b.isPlainObject(a)){this.options=b.extend(!0,this.options,a);for(var c in a)this._updateOption(c)}},_updateOption:function(a){var b="_update"+a.charAt(0).toUpperCase()+a.slice(1);this[b]&&this[b]()},_updateAnimationEngine:function(){var a=this.options.animationEngine.toLowerCase().replace(/[ _\-]/g,"");switch(a){case"css":case"none":this.isUsingJQueryAnimation=!1;break;case"jquery":this.isUsingJQueryAnimation=!0;break;default:this.isUsingJQueryAnimation=!Modernizr.csstransitions}this._updateUsingTransforms()},_updateTransformsEnabled:function(){this._updateUsingTransforms()},_updateUsingTransforms:function(){this.usingTransforms=this.options.transformsEnabled&&Modernizr.csstransforms&&Modernizr.csstransitions&&!this.isUsingJQueryAnimation,this.getPositionStyles=this.usingTransforms?this._translate:this._positionAbs},_filter:function(a){var b,c=this.options.filter===""?"*":this.options.filter;if(!c)b=a;else{var d=this.options.hiddenClass,e="."+d,f=a.not(e),g=a.filter(e),h=g;b=a.filter(c);if(c!=="*"){h=g.filter(c);var i=f.not(c).toggleClass(d);i.addClass(d),this.styleQueue.push({$el:i,style:this.options.hiddenStyle})}this.styleQueue.push({$el:h,style:this.options.visibleStyle}),h.removeClass(d)}return b},updateSortData:function(a,c){var d=this,e=this.options.getSortData,f,g;a.each(function(){f=b(this),g={};for(var a in e)g[a]=e[a](f,d);b.data(this,"isotope-sort-data",g),c&&d.elemCount++})},_sort:function(){var a=this.options.sortBy,b=this._getSorter,c=this.options.sortAscending?1:-1,d=function(d,e){var f=b(d,a),g=b(e,a);f===g&&a!=="original-order"&&(f=b(d,"original-order"),g=b(e,"original-order"));return(f>g?1:f<g?-1:0)*c};this.$filteredAtoms.sort(d)},_getSorter:function(a,c){return b.data(a,"isotope-sort-data")[c]},_translate:function(a,b){return{translate:[a,b]}},_positionAbs:function(a,b){return{left:a,top:b}},_pushPosition:function(a,b,c){b+=this.offset.left,c+=this.offset.top;var d=this.getPositionStyles(b,c);this.styleQueue.push({$el:a,style:d}),this.options.itemPositionDataEnabled&&a.data("isotope-item-position",{x:b,y:c})},layout:function(a,c){var d=this.options.layoutMode;this["_"+d+"Layout"](a);if(this.options.resizesContainer){var e=this["_"+d+"GetContainerSize"]();this.styleQueue.push({$el:this.element,style:e})}var f=this.isLaidOut?this.isUsingJQueryAnimation?"animate":"css":"css",g=this.options.animationOptions;b.each(this.styleQueue,function(a,b){b.$el[f](b.style,g)}),this.styleQueue=[],c&&c.call(a),this.isLaidOut=!0},resize:function(){this["_"+this.options.layoutMode+"ResizeChanged"]()&&this.reLayout()},reLayout:function(a){this["_"+this.options.layoutMode+"Reset"](),this.layout(this.$filteredAtoms,a)},addItems:function(a,b){var c=this._getAtoms(a);this.$allAtoms=this.$allAtoms.add(c),b&&b(c)},insert:function(a,b){this.element.append(a);var c=this;this.addItems(a,function(a){var b=c._filter(a);c.$filteredAtoms=c.$filteredAtoms.add(b)}),this._sort(),this.reLayout(b)},appended:function(a,b){var c=this;this.addItems(a,function(a){c.$filteredAtoms=c.$filteredAtoms.add(a),c.layout(a,b)})},reloadItems:function(){this.$allAtoms=this._getAtoms(this.element.children())},remove:function(a){this.$allAtoms=this.$allAtoms.not(a),this.$filteredAtoms=this.$filteredAtoms.not(a),a.remove()},_shuffleArray:function(a){var b,c,d=a.length;if(d)while(--d)c=~~(Math.random()*(d+1)),b=a[c],a[c]=a[d],a[d]=b;return a},shuffle:function(a){this.options.sortBy="shuffle",this.$allAtoms=this._shuffleArray(this.$allAtoms),this.$filteredAtoms=this._filter(this.$allAtoms),this.reLayout(a)},destroy:function(){var c=this.usingTransforms;this.$allAtoms.removeClass(this.options.hiddenClass+" "+this.options.itemClass).each(function(){this.style.position=null,this.style.top=null,this.style.left=null,this.style.opacity=null,c&&(this.style[e]=null)});var d=this.element[0].style;for(var f=0,g=p.length;f<g;f++){var h=p[f];d[h]=this.originalStyle[h]}this.element.unbind(".isotope").removeClass(this.options.containerClass).removeData("isotope"),b(a).unbind(".isotope")},_getSegments:function(a){var b=this.options.layoutMode,c=a?"rowHeight":"columnWidth",d=a?"height":"width",e=a?"Height":"Width",f=a?"rows":"cols",g=this.element[d](),h,i;i=this.options[b]&&this.options[b][c]||this.$filteredAtoms["outer"+e](!0)||g,h=Math.floor(g/i),h=Math.max(h,1),this[b][f]=h,this[b][c]=i},_checkIfSegmentsChanged:function(a){var b=this.options.layoutMode,c=a?"rows":"cols",d=this[b][c];this._getSegments(a);return this[b][c]!==d},_masonryReset:function(){this.masonry={},this._getSegments();var a=this.masonry.cols;this.masonry.colYs=[];while(a--)this.masonry.colYs.push(0)},_masonryLayout:function(a){var c=this,d=c.masonry;a.each(function(){var a=b(this),e=Math.ceil(a.outerWidth(!0)/d.columnWidth);e=Math.min(e,d.cols);if(e===1)c._masonryPlaceBrick(a,d.colYs);else{var f=d.cols+1-e,g=[],h,i;for(i=0;i<f;i++)h=d.colYs.slice(i,i+e),g[i]=Math.max.apply(Math,h);c._masonryPlaceBrick(a,g)}})},_masonryPlaceBrick:function(a,b){var c=Math.min.apply(Math,b),d=0;for(var e=0,f=b.length;e<f;e++)if(b[e]===c){d=e;break}x=this.masonry.columnWidth*d,y=c,this._pushPosition(a,x,y);var g=c+a.outerHeight(!0),h=this.masonry.cols+1-f;for(e=0;e<h;e++)this.masonry.colYs[d+e]=g},_masonryGetContainerSize:function(){var a=Math.max.apply(Math,this.masonry.colYs);return{height:a}},_masonryResizeChanged:function(){return this._checkIfSegmentsChanged()},_fitRowsReset:function(){this.fitRows={x:0,y:0,height:0}},_fitRowsLayout:function(a){var c=this,d=this.element.width(),e=this.fitRows;a.each(function(){var a=b(this),f=a.outerWidth(!0),g=a.outerHeight(!0),h,i;e.x!==0&&f+e.x>d&&(e.x=0,e.y=e.height),c._pushPosition(a,e.x,e.y),e.height=Math.max(e.y+g,e.height),e.x+=f})},_fitRowsGetContainerSize:function(){return{height:this.fitRows.height}},_fitRowsResizeChanged:function(){return!0},_cellsByRowReset:function(){this.cellsByRow={index:0},this._getSegments(),this._getSegments(!0)},_cellsByRowLayout:function(a){var c=this,d=this.cellsByRow;a.each(function(){var a=b(this),e=d.index%d.cols,f=~~(d.index/d.cols),g=(e+.5)*d.columnWidth-a.outerWidth(!0)/2,h=(f+.5)*d.rowHeight-a.outerHeight(!0)/2;c._pushPosition(a,g,h),d.index++})},_cellsByRowGetContainerSize:function(){return{height:Math.ceil(this.$filteredAtoms.length/this.cellsByRow.cols)*this.cellsByRow.rowHeight+this.offset.top}},_cellsByRowResizeChanged:function(){return this._checkIfSegmentsChanged()},_straightDownReset:function(){this.straightDown={y:0}},_straightDownLayout:function(a){var c=this;a.each(function(a){var d=b(this);c._pushPosition(d,0,c.straightDown.y),c.straightDown.y+=d.outerHeight(!0)})},_straightDownGetContainerSize:function(){return{height:this.straightDown.y}},_straightDownResizeChanged:function(){return!0},_masonryHorizontalReset:function(){this.masonryHorizontal={},this._getSegments(!0);var a=this.masonryHorizontal.rows;this.masonryHorizontal.rowXs=[];while(a--)this.masonryHorizontal.rowXs.push(0)},_masonryHorizontalLayout:function(a){var c=this,d=c.masonryHorizontal;a.each(function(){var a=b(this),e=Math.ceil(a.outerHeight(!0)/d.rowHeight);e=Math.min(e,d.rows);if(e===1)c._masonryHorizontalPlaceBrick(a,d.rowXs);else{var f=d.rows+1-e,g=[],h,i;for(i=0;i<f;i++)h=d.rowXs.slice(i,i+e),g[i]=Math.max.apply(Math,h);c._masonryHorizontalPlaceBrick(a,g)}})},_masonryHorizontalPlaceBrick:function(a,b){var c=Math.min.apply(Math,b),d=0;for(var e=0,f=b.length;e<f;e++)if(b[e]===c){d=e;break}x=c,y=this.masonryHorizontal.rowHeight*d,this._pushPosition(a,x,y);var g=c+a.outerWidth(!0),h=this.masonryHorizontal.rows+1-f;for(e=0;e<h;e++)this.masonryHorizontal.rowXs[d+e]=g},_masonryHorizontalGetContainerSize:function(){var a=Math.max.apply(Math,this.masonryHorizontal.rowXs);return{width:a}},_masonryHorizontalResizeChanged:function(){return this._checkIfSegmentsChanged(!0)},_fitColumnsReset:function(){this.fitColumns={x:0,y:0,width:0}},_fitColumnsLayout:function(a){var c=this,d=this.element.height(),e=this.fitColumns;a.each(function(){var a=b(this),f=a.outerWidth(!0),g=a.outerHeight(!0),h,i;e.y!==0&&g+e.y>d&&(e.x=e.width,e.y=0),c._pushPosition(a,e.x,e.y),e.width=Math.max(e.x+f,e.width),e.y+=g})},_fitColumnsGetContainerSize:function(){return{width:this.fitColumns.width}},_fitColumnsResizeChanged:function(){return!0},_cellsByColumnReset:function(){this.cellsByColumn={index:0},this._getSegments(),this._getSegments(!0)},_cellsByColumnLayout:function(a){var c=this,d=this.cellsByColumn;a.each(function(){var a=b(this),e=~~(d.index/d.rows),f=d.index%d.rows,g=(e+.5)*d.columnWidth-a.outerWidth(!0)/2,h=(f+.5)*d.rowHeight-a.outerHeight(!0)/2;c._pushPosition(a,g,h),d.index++})},_cellsByColumnGetContainerSize:function(){return{width:Math.ceil(this.$filteredAtoms.length/this.cellsByColumn.rows)*this.cellsByColumn.columnWidth}},_cellsByColumnResizeChanged:function(){return this._checkIfSegmentsChanged(!0)},_straightAcrossReset:function(){this.straightAcross={x:0}},_straightAcrossLayout:function(a){var c=this;a.each(function(a){var d=b(this);c._pushPosition(d,c.straightAcross.x,0),c.straightAcross.x+=d.outerWidth(!0)})},_straightAcrossGetContainerSize:function(){return{width:this.straightAcross.x}},_straightAcrossResizeChanged:function(){return!0}},b.fn.imagesLoaded=function(a){var b=this.find("img"),d=b.length,e=this;b.length||a.call(this),b.bind("load",function(){--d<=0&&a.call(e)}).each(function(){if(this.complete||this.complete===c){var a=this.src;this.src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==",this.src=a}});return this},b.fn.isotope=function(a){if(typeof a=="string"){var c=Array.prototype.slice.call(arguments,1);this.each(function(){var d=b.data(this,"isotope");if(!d)return b.error("cannot call methods on isotope prior to initialization; attempted to call method '"+a+"'");if(!b.isFunction(d[a])||a.charAt(0)==="_")return b.error("no such method '"+a+"' for isotope instance");d[a].apply(d,c)})}else this.each(function(){var c=b.data(this,"isotope");c?(c.option(a),c._init()):b.data(this,"isotope",new b.Isotope(a,this))});return this}})(window,jQuery);