Browse Source

Merge branch 'master' into gh-pages

v1
David DeSandro 13 years ago
parent
commit
bc811644e8
  1. 10
      jquery.isotope.js
  2. 4
      jquery.isotope.min.js

10
jquery.isotope.js

@ -1,5 +1,5 @@
/** /**
* Isotope v1.5.20 * Isotope v1.5.21
* An exquisite jQuery plugin for magical layouts * An exquisite jQuery plugin for magical layouts
* http://isotope.metafizzy.co * http://isotope.metafizzy.co
* *
@ -804,11 +804,12 @@
// removes elements from Isotope widget // removes elements from Isotope widget
remove: function( $content, callback ) { remove: function( $content, callback ) {
// remove elements from Isotope instance in callback // remove elements immediately from Isotope instance
var instance = this; this.$allAtoms = this.$allAtoms.not( $content );
this.$filteredAtoms = this.$filteredAtoms.not( $content );
// remove() as a callback, for after transition / animation // remove() as a callback, for after transition / animation
var instance = this;
var removeContent = function() { var removeContent = function() {
instance.$allAtoms = instance.$allAtoms.not( $content );
$content.remove(); $content.remove();
if ( callback ) { if ( callback ) {
callback.call( instance.element ); callback.call( instance.element );
@ -818,7 +819,6 @@
if ( $content.filter( ':not(.' + this.options.hiddenClass + ')' ).length ) { if ( $content.filter( ':not(.' + this.options.hiddenClass + ')' ).length ) {
// if any non-hidden content needs to be removed // if any non-hidden content needs to be removed
this.styleQueue.push({ $el: $content, style: this.options.hiddenStyle }); this.styleQueue.push({ $el: $content, style: this.options.hiddenStyle });
this.$filteredAtoms = this.$filteredAtoms.not( $content );
this._sort(); this._sort();
this.reLayout( removeContent ); this.reLayout( removeContent );
} else { } else {

4
jquery.isotope.min.js vendored

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save