Merge branch 'master' into gh-pages

_posts/demos/2011-12-22-removing.html

@@ -23,7 +23,10 @@ category: demos
       <li><a href="#remove" data-option-value=".metalloid">metalloid</a></li>
     </ul>
 
-    
+    <ul id="add-remove">
+      <li><a href="#add-remove">Add / remove</a></li>
+    </ul>
+
   </section> <!-- #options -->
   
   <div id="container" class="variable-sizes clickable clearfix">
@@ -34,27 +37,43 @@ category: demos
   
   <script src="../{{ site.jquery_js }}"></script>
   <script src="../{{ site.isotope_js }}"></script>
+  <script src="../js/fake-element.js"></script>
   <script>
     $(function(){
-      
+
       var $container = $('#container');
 
       $container.isotope({
         itemSelector : '.element'
       });
-      
-      $('#removable a').click(function(){
+
+      $('#removable a').click( function( jQEvent ) {
         var selector = $(this).attr('data-option-value');
         var $removable = $container.find( selector );
         $container.isotope( 'remove', $removable );
+        jQEvent.preventDefault();
       });
-      
+
+      $('#add-remove a').click( function( jQEvent ) {
+        var $newEls = $( fakeElement.getGroup() );
+        var $firstTwoElems = $container.data('isotope')
+          .$filteredAtoms.filter( function( i ) {
+            return i < 2;
+          });
+
+        $container
+          .isotope( 'insert', $newEls )
+          .isotope( 'remove', $firstTwoElems, function() {
+            // console.log('items removed')
+          });
+        jQEvent.preventDefault();
+      });
+
       // remove item if clicked
       $container.delegate( '.element', 'click', function(){
         $container.isotope( 'remove', $(this) );
       });
-      
-      
+
     });
   </script>
   

jquery.isotope.js

@@ -1,5 +1,5 @@
 /**
- * Isotope v1.5.14
+ * Isotope v1.5.15
  * An exquisite jQuery plugin for magical layouts
  * http://isotope.metafizzy.co
  *
@@ -678,10 +678,11 @@
         } else if ( Modernizr.csstransitions ) {
           // detect if first item has transition
           var i = 0,
-              testElem = this.styleQueue[0].$el,
+              firstItem = this.styleQueue[0],
+              testElem = firstItem && firstItem.$el,
               styleObj;
           // get first non-empty jQ object
-          while ( !testElem.length ) {
+          while ( !testElem || !testElem.length ) {
             styleObj = this.styleQueue[ i++ ];
             // HACK: sometimes styleQueue[i] is undefined
             if ( !styleObj ) {
@@ -805,9 +806,13 @@
     remove: function( $content, callback ) {
       // remove elements from Isotope instance in callback
       var instance = this;
+      // remove() as a callback, for after transition / animation
       var removeContent = function() {
         instance.$allAtoms = instance.$allAtoms.not( $content );
         $content.remove();
+        if ( callback ) {
+          callback.call( this.element );
+        }
       };
 
       if ( $content.filter( ':not(.' + this.options.hiddenClass + ')' ).length ) {
@@ -815,13 +820,10 @@
         this.styleQueue.push({ $el: $content, style: this.options.hiddenStyle });
         this.$filteredAtoms = this.$filteredAtoms.not( $content );
         this._sort();
-        this.reLayout( removeContent, callback );
+        this.reLayout( removeContent );
       } else {
         // remove it now
         removeContent();
-        if ( callback ) {
-          callback.call( this.element );
-        }
       }
 
     },