Browse Source

Merge branch 'master' into gh-pages

v1
David DeSandro 14 years ago
parent
commit
6b5049e7fb
  1. 11
      jquery.isotope.js
  2. 4
      jquery.isotope.min.js

11
jquery.isotope.js

@ -1,5 +1,5 @@
/** /**
* Isotope v1.3.110620 * Isotope v1.3.110623
* An exquisite jQuery plugin for magical layouts * An exquisite jQuery plugin for magical layouts
* http://isotope.metafizzy.co * http://isotope.metafizzy.co
* *
@ -762,16 +762,13 @@
var namespace = this.options.layoutMode, var namespace = this.options.layoutMode,
measure = isRows ? 'rowHeight' : 'columnWidth', measure = isRows ? 'rowHeight' : 'columnWidth',
size = isRows ? 'height' : 'width', size = isRows ? 'height' : 'width',
UCSize = isRows ? 'Height' : 'Width',
segmentsName = isRows ? 'rows' : 'cols', segmentsName = isRows ? 'rows' : 'cols',
containerSize = this.element[ size ](), containerSize = this.element[ size ](),
segments, segments,
segmentSize;
// i.e. options.masonry && options.masonry.columnWidth // i.e. options.masonry && options.masonry.columnWidth
segmentSize = this.options[ namespace ] && this.options[ namespace ][ measure ] || segmentSize = this.options[ namespace ] && this.options[ namespace ][ measure ] ||
// or use the size of the first item // or use the size of the first item, i.e. outerWidth
this.$filteredAtoms[ 'outer' + UCSize ](true) || this.$filteredAtoms[ 'outer' + capitalize(size) ](true) ||
// if there's no items, use size of container // if there's no items, use size of container
containerSize; containerSize;

4
jquery.isotope.min.js vendored

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