Browse Source

src : refactor, remove this.width / this.height, make local vars

pull/96/head
David DeSandro 14 years ago
parent
commit
175a3523e3
  1. 19
      jquery.isotope.js
  2. 2
      jquery.isotope.min.js

19
jquery.isotope.js

@ -764,19 +764,18 @@
size = isRows ? 'height' : 'width', size = isRows ? 'height' : 'width',
UCSize = isRows ? 'Height' : 'Width', UCSize = isRows ? 'Height' : 'Width',
segmentsName = isRows ? 'rows' : 'cols', segmentsName = isRows ? 'rows' : 'cols',
containerSize = this.element[ size ](),
segments, segments,
segmentSize; segmentSize;
this[ size ] = this.element[ size ]();
// 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
this.$filteredAtoms[ 'outer' + UCSize ](true) || this.$filteredAtoms[ 'outer' + UCSize ](true) ||
// if there's no items, use size of container // 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 ); segments = Math.max( segments, 1 );
// i.e. this.masonry.cols = .... // i.e. this.masonry.cols = ....
@ -892,8 +891,8 @@
}, },
_fitRowsLayout : function( $elems ) { _fitRowsLayout : function( $elems ) {
this.width = this.element.width(); var instance = this,
var instance = this; containerWidth = this.element.width();
$elems.each( function() { $elems.each( function() {
var $this = $(this), var $this = $(this),
@ -901,7 +900,7 @@
atomH = $this.outerHeight(true), atomH = $this.outerHeight(true),
x, y; x, y;
if ( instance.fitRows.x !== 0 && atomW + instance.fitRows.x > instance.width ) { if ( instance.fitRows.x !== 0 && atomW + instance.fitRows.x > containerWidth ) {
// if this element cannot fit in the current row // if this element cannot fit in the current row
instance.fitRows.x = 0; instance.fitRows.x = 0;
instance.fitRows.y = instance.fitRows.height; instance.fitRows.y = instance.fitRows.height;
@ -1085,15 +1084,15 @@
}, },
_fitColumnsLayout : function( $elems ) { _fitColumnsLayout : function( $elems ) {
var instance = this; var instance = this,
this.height = this.element.height(); containerHeight = this.element.height();
$elems.each( function() { $elems.each( function() {
var $this = $(this), var $this = $(this),
atomW = $this.outerWidth(true), atomW = $this.outerWidth(true),
atomH = $this.outerHeight(true), atomH = $this.outerHeight(true),
x, y; x, y;
if ( instance.fitColumns.y !== 0 && atomH + instance.fitColumns.y > instance.height ) { if ( instance.fitColumns.y !== 0 && atomH + instance.fitColumns.y > containerHeight ) {
// if this element cannot fit in the current column // if this element cannot fit in the current column
instance.fitColumns.x = instance.fitColumns.width; instance.fitColumns.x = instance.fitColumns.width;
instance.fitColumns.y = 0; instance.fitColumns.y = 0;

2
jquery.isotope.min.js vendored

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