Merge branch 'master' into gh-pages

13 years ago · adf4aecd6c
4 changed files with 42 additions and 40 deletions
--- a/_posts/docs/2010-12-04-methods.mdown
+++ b/_posts/docs/2010-12-04-methods.mdown
@ -130,7 +130,7 @@ Re-collects all item elements in their current order in the DOM.  Useful for pre

 {% highlight javascript %}

-.isotope( 'remove', $items )
+.isotope( 'remove', $items, callback )

 {% endhighlight %}

--- a/jquery.isotope.js
+++ b/jquery.isotope.js
@ -1,20 +1,22 @@
 /**
- * Isotope v1.5.10
+ * Isotope v1.5.11
 * An exquisite jQuery plugin for magical layouts
 * http://isotope.metafizzy.co
 *
 * Commercial use requires one-time license fee
 * http://metafizzy.co/#licenses
 *
- * Copyright 2011 David DeSandro / Metafizzy
+ * Copyright 2012 David DeSandro / Metafizzy
 */

 /*jshint curly: true, eqeqeq: true, forin: false, immed: false, newcap: true, noempty: true, undef: true */
-/*global Modernizr: true, jQuery: true */
+/*global window: true, jQuery: true */

 (function( window, $, undefined ){

-  'use strict';
+  // get global vars
+  var document = window.document;
+  var Modernizr = window.Modernizr;

  // helper function
  var capitalize = function( str ) {
@ -100,9 +102,11 @@
    }
  };

-  if ( window.Modernizr ) {
+  var testName;
+
+  if ( Modernizr ) {
    // if there's a previous Modernzir, check if there are necessary tests
-    for ( var testName in tests) {
+    for ( testName in tests) {
      if ( !Modernizr.hasOwnProperty( testName ) ) {
        // if test hasn't been run, use addTest to run it
        Modernizr.addTest( testName, tests[ testName ] );
@ -110,28 +114,23 @@
    }
  } else {
    // or create new mini Modernizr that just has the 3 tests
-    window.Modernizr = (function(){
-
-      var miniModernizr = {
-            _version : '1.6ish: miniModernizr for Isotope'
-          },
-          classes = ' ',
-          result, testName;
-
-      // Run through tests
-      for ( testName in tests) {
-        result = tests[ testName ]();
-        miniModernizr[ testName ] = result;
-        classes += ' ' + ( result ?  '' : 'no-' ) + testName;
-      }
+    Modernizr = window.Modernizr = {
+      _version : '1.6ish: miniModernizr for Isotope'
+    };

-      // Add the new classes to the <html> element.
-      $('html').addClass( classes );
+    var classes = ' ';
+    var result;

-      return miniModernizr;
-    })();
-  }
+    // Run through tests
+    for ( testName in tests) {
+      result = tests[ testName ]();
+      Modernizr[ testName ] = result;
+      classes += ' ' + ( result ?  '' : 'no-' ) + testName;
+    }

+    // Add the new classes to the <html> element.
+    $('html').addClass( classes );
+  }


  // ========================= isoTransform ===============================
@ -795,7 +794,7 @@
    },
    
    // removes elements from Isotope widget
-    remove: function( $content ) {
+    remove: function( $content, callback ) {
      // remove elements from Isotope instance in callback
      var instance = this;
      var removeContent = function() {
@ -808,10 +807,13 @@
        this.styleQueue.push({ $el: $content, style: this.options.hiddenStyle });
        this.$filteredAtoms = this.$filteredAtoms.not( $content );
        this._sort();
-        this.reLayout( removeContent );
+        this.reLayout( removeContent, callback );
      } else {
        // remove it now
        removeContent();
+        if ( callback ) {
+          callback.call( this.element );
+        }
      }

    },
--- a/jquery.isotope.min.js
+++ b/jquery.isotope.min.js
--- a/minify.sh
+++ b/minify.sh
@ -3,13 +3,15 @@
 # minifies jquery.isotope.js
 # requires nodejs & uglifyjs

-JS=jquery.isotope.js
-JS_MIN=jquery.isotope.min.js
+IN=jquery.isotope.js
+OUT=jquery.isotope.min.js

-# minify with UglifyJS
+# remove any lines that begin with /*jshint or /*global
+# then, minify with Uglify JS
 # then, add newline characters after `*/`, but not last newline character
-uglifyjs $JS \
-  | awk '{ORS=""; gsub(/\*\//,"*/\n"); if (NR!=1) print "\n"; print;}' > $JS_MIN
+awk '!/^\/\*[jshint|global]/' $IN \
+  | uglifyjs \
+  | awk '{ORS=""; gsub(/\*\//,"*/\n"); if (NR!=1) print "\n"; print;}' > $OUT
 # add trailing semicolon
-echo ';' >> $JS_MIN
-echo "Minified" $JS "as" $JS_MIN
+echo ';' >> $OUT
+echo "Minified" $IN "as" $OUT