Browse Source

clearFloat -> fitRows

pull/14/head
David DeSandro 14 years ago
parent
commit
5f9466cce2
  1. 4
      _layouts/elements.html
  2. 30
      src/jquery.isotope.js

4
_layouts/elements.html

@ -73,7 +73,7 @@
<ul id="layouts" class="option-set floated clearfix"> <ul id="layouts" class="option-set floated clearfix">
<li><a href="#masonry" class="selected">masonry</a></li> <li><a href="#masonry" class="selected">masonry</a></li>
<li><a href="#clearFloat">clearFloat</a></li> <li><a href="#fitRows">fitRows</a></li>
<li><a href="#cellsByRow">cellsByRow</a></li> <li><a href="#cellsByRow">cellsByRow</a></li>
<li><a href="#masonryHorizontal" class="horizontal">masonryHorizontal</a></li> <li><a href="#masonryHorizontal" class="horizontal">masonryHorizontal</a></li>
<li><a href="#fitColumns" class="horizontal">fitColumns</a></li> <li><a href="#fitColumns" class="horizontal">fitColumns</a></li>
@ -127,7 +127,7 @@
// console.time('initializeMe'); // console.time('initializeMe');
$demo.isotope({ $demo.isotope({
itemSelector : '.element', itemSelector : '.element',
// layoutMode : 'clearFloat', // layoutMode : 'fitRows',
masonry : { masonry : {
columnWidth : 120 columnWidth : 120
}, },

30
src/jquery.isotope.js

@ -274,7 +274,7 @@
// ====================== ClearFloat ====================== // ====================== fitRows ======================
@ -568,11 +568,11 @@
}); });
// ====================== clearFloat ====================== // ====================== fitRows ======================
$.extend( $.Isotope.prototype, { $.extend( $.Isotope.prototype, {
_clearFloatLayout : function( $elems ) { _fitRowsLayout : function( $elems ) {
var instance = this; var instance = this;
return $elems.each( function() { return $elems.each( function() {
var $this = $(this), var $this = $(this),
@ -580,25 +580,25 @@
atomH = $this.outerHeight(true), atomH = $this.outerHeight(true),
x, y; x, y;
if ( instance.clearFloat.x !== 0 && atomW + instance.clearFloat.x > instance.width ) { if ( instance.fitRows.x !== 0 && atomW + instance.fitRows.x > instance.width ) {
// if this element cannot fit in the current row // if this element cannot fit in the current row
instance.clearFloat.x = 0; instance.fitRows.x = 0;
instance.clearFloat.y = instance.clearFloat.height; instance.fitRows.y = instance.fitRows.height;
} }
// position the atom // position the atom
x = instance.clearFloat.x + instance.posLeft; x = instance.fitRows.x + instance.posLeft;
y = instance.clearFloat.y + instance.posTop; y = instance.fitRows.y + instance.posTop;
instance._pushPosition( $this, x, y ); instance._pushPosition( $this, x, y );
instance.clearFloat.height = Math.max( instance.clearFloat.y + atomH, instance.clearFloat.height ); instance.fitRows.height = Math.max( instance.fitRows.y + atomH, instance.fitRows.height );
instance.clearFloat.x += atomW; instance.fitRows.x += atomW;
}); });
}, },
_clearFloatReset : function() { _fitRowsReset : function() {
this.clearFloat = { this.fitRows = {
x : 0, x : 0,
y : 0, y : 0,
height : 0 height : 0
@ -606,11 +606,11 @@
return this; return this;
}, },
_clearFloatGetContainerSize : function () { _fitRowsGetContainerSize : function () {
return { height : this.clearFloat.height }; return { height : this.fitRows.height };
}, },
_clearFloatResize : function() { _fitRowsResize : function() {
this.width = this.element.width(); this.width = this.element.width();
return this.reLayout() return this.reLayout()
} }

Loading…
Cancel
Save