Browse Source

Merge branch 'master' of github.com:desandro/isotope

pull/294/merge
David DeSandro 12 years ago
parent
commit
e97d11299a
  1. 2
      _posts/custom-layout-modes/2011-10-18-spine-align.html
  2. 10
      jquery.isotope.js
  3. 4
      jquery.isotope.min.js

2
_posts/custom-layout-modes/2011-10-18-spine-align.html

@ -69,7 +69,7 @@ $container.isotope({
$elems.each(function(){
var $this = $(this),
isColA = props.colB > props.colA,
isColA = props.colA <= props.colB,
x = isColA ?
centerX - ( $this.outerWidth(true) + gutterWidth / 2 ) : // left side
centerX + gutterWidth / 2, // right side

10
jquery.isotope.js

@ -1,5 +1,5 @@
/**
* Isotope v1.5.21
* Isotope v1.5.25
* An exquisite jQuery plugin for magical layouts
* http://isotope.metafizzy.co
*
@ -280,6 +280,7 @@
*/
var $event = $.event,
dispatchMethod = $.event.handle ? 'handle' : 'dispatch',
resizeTimeout;
$event.special.smartresize = {
@ -299,7 +300,7 @@
if ( resizeTimeout ) { clearTimeout( resizeTimeout ); }
resizeTimeout = setTimeout(function() {
jQuery.event.handle.apply( context, args );
$event[ dispatchMethod ].apply( context, args );
}, execAsap === "execAsap"? 0 : 100 );
}
};
@ -427,6 +428,11 @@
// base style for atoms
atomStyle = { position: 'absolute' };
// filter out text nodes
$atoms = $atoms.filter( function( i, atom ) {
return atom.nodeType === 1;
});
if ( this.usingTransforms ) {
atomStyle.left = 0;
atomStyle.top = 0;

4
jquery.isotope.min.js vendored

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