Browse Source

src : within layout - remove layoutMethod, and extending animOpts

pull/27/head
David DeSandro 14 years ago
parent
commit
8ef3eaf79f
  1. 11
      jquery.isotope.js

11
jquery.isotope.js

@ -597,8 +597,7 @@
// accepts atoms-to-be-laid-out to start with // accepts atoms-to-be-laid-out to start with
layout : function( $elems, callback ) { layout : function( $elems, callback ) {
var layoutMode = this.options.layoutMode, var layoutMode = this.options.layoutMode;
layoutMethod = '_' + layoutMode;
// layout logic // layout logic
this[ '_' + layoutMode + 'Layout' ]( $elems ); this[ '_' + layoutMode + 'Layout' ]( $elems );
@ -616,15 +615,11 @@
'css' : this.applyStyleFnName, 'css' : this.applyStyleFnName,
animOpts = this.options.animationOptions; animOpts = this.options.animationOptions;
// process styleQueue // process styleQueue
$.each( this.styleQueue, function( i, obj ){ $.each( this.styleQueue, function( i, obj ) {
// have to extend animation to play nice with jQuery obj.$el[ styleFn ]( obj.style, animOpts );
obj.$el[ styleFn ]( obj.style, $.extend( {}, animOpts ) );
}); });
// clear out queue for next time // clear out queue for next time
this.styleQueue = []; this.styleQueue = [];

Loading…
Cancel
Save