diff --git a/jquery.isotope.js b/jquery.isotope.js index cf12134..97fffc3 100644 --- a/jquery.isotope.js +++ b/jquery.isotope.js @@ -698,21 +698,11 @@ window.Modernizr = window.Modernizr || (function(window,doc,undefined){ return array; }, - logNames : function( $atoms ) { - var message = ''; - $atoms.each(function(){ - message += $(this).find('.name').text() + ', '; - }); - window.console && console.log( message ); - }, - // HACKy should probably remove shuffle : function( callback ) { this.options.sortBy = 'shuffle'; - this.logNames( this.$allAtoms ); this.$allAtoms = this._shuffleArray( this.$allAtoms ); - this.logNames( this.$allAtoms ); this.$filteredAtoms = this._filter( this.$allAtoms ); return this.reLayout( callback ); diff --git a/jquery.isotope.min.js b/jquery.isotope.min.js index 5022d95..96acc45 100644 --- a/jquery.isotope.min.js +++ b/jquery.isotope.min.js @@ -23,18 +23,18 @@ c.elemCount++})},_filter:function(a){var b=this.options.filter===""?"*":this.opt 1:-1;sortFn=function(d,f){var g=b(d),h=b(f);return(g>h?1:gb.width){b.fitRows.x=0;b.fitRows.y=b.fitRows.height}b._pushPosition(c,b.fitRows.x+b.posLeft,b.fitRows.y+b.posTop);b.fitRows.height=Math.max(b.fitRows.y+f,b.fitRows.height);b.fitRows.x+= -d})},_fitRowsReset:function(){this.fitRows={x:0,y:0,height:0};return this},_fitRowsGetContainerSize:function(){return{height:this.fitRows.height}},_fitRowsResize:function(){return this.reLayout()},_cellsByRowReset:function(){this.cellsByRow={};this._getSegments("cellsByRow");this.cellsByRow.rowHeight=this.options.cellsByRow.rowHeight||this.$allAtoms.outerHeight(true);return this},_cellsByRowLayout:function(a){var b=this,c=this.cellsByRow.cols;this.cellsByRow.atomsLen=a.length;a.each(function(d){var f= -e(this),g=(d%c+0.5)*b.cellsByRow.columnWidth-f.outerWidth(true)/2+b.posLeft;d=(~~(d/c)+0.5)*b.cellsByRow.rowHeight-f.outerHeight(true)/2+b.posTop;b._pushPosition(f,g,d)});return this},_cellsByRowGetContainerSize:function(){return{height:Math.ceil(this.cellsByRow.atomsLen/this.cellsByRow.cols)*this.cellsByRow.rowHeight+this.posTop}},_cellsByRowResize:function(){var a=this.cellsByRow.cols;this._getSegments("cellsByRow");this.cellsByRow.cols!==a&&this.reLayout();return this},_straightDownReset:function(){this.straightDown= -{y:0};return this},_straightDownLayout:function(a){var b=this;a.each(function(){var c=e(this);b._pushPosition(c,b.posLeft,b.straightDown.y+b.posTop);b.straightDown.y+=c.outerHeight(true)});return this},_straightDownGetContainerSize:function(){return{height:this.straightDown.y+this.posTop}},_straightDownResize:function(){this.reLayout();return this},_masonryHorizontalPlaceBrick:function(a,b,c){b=Math.min.apply(Math,c);for(var d=b+a.outerWidth(true),f=c.length,g=f,h=this.masonryHorizontal.rows+1-f;f--;)if(c[f]=== -b)g=f;this._pushPosition(a,b,this.masonryHorizontal.rowHeight*g+this.posTop);for(f=0;fb.height){b.fitColumns.x=b.fitColumns.width;b.fitColumns.y=0}b._pushPosition(c,b.fitColumns.x+b.posLeft,b.fitColumns.y+b.posTop);b.fitColumns.width=Math.max(b.fitColumns.x+d,b.fitColumns.width); -b.fitColumns.y+=f})},_fitColumnsGetContainerSize:function(){return{width:this.fitColumns.width}},_fitColumnsResize:function(){return this.reLayout()},_cellsByColumnReset:function(){this.cellsByColumn={};this._getSegments("cellsByColumn",true);this.cellsByColumn.columnWidth=this.options.cellsByColumn.columnWidth||this.$allAtoms.outerHeight(true);return this},_cellsByColumnLayout:function(a){var b=this,c=this.cellsByColumn.rows;this.cellsByColumn.atomsLen=a.length;a.each(function(d){var f=e(this),g= -(~~(d/c)+0.5)*b.cellsByColumn.columnWidth-f.outerWidth(true)/2+b.posLeft;d=(d%c+0.5)*b.cellsByColumn.rowHeight-f.outerHeight(true)/2+b.posTop;b._pushPosition(f,g,d)});return this},_cellsByColumnGetContainerSize:function(){return{width:Math.ceil(this.cellsByColumn.atomsLen/this.cellsByColumn.rows)*this.cellsByColumn.columnWidth+this.posLeft}},_cellsByColumnResize:function(){var a=this.cellsByColumn.rows;this._getSegments("cellsByColumn",true);this.cellsByColumn.rows!==a&&this.reLayout();return this}}; -e.fn.imagesLoaded=function(a){var b=this.find("img"),c=b.length,d=this;b.bind("load",function(){--c<=0&&a.call(d)}).each(function(){if(this.complete||this.complete===k){var f=this.src;this.src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==";this.src=f}});return this};e.widget=e.widget||{};e.widget.bridge=e.widget.bridge||function(a,b){e.fn[a]=function(c){var d=typeof c==="string",f=Array.prototype.slice.call(arguments,1),g=this;c=!d&&f.length?e.extend.apply(null,[true,c].concat(f)): -c;if(d&&c.charAt(0)==="_")return g;d?this.each(function(){var h=e.data(this,a);if(!h)return e.error("cannot call methods on "+a+" prior to initialization; attempted to call method '"+c+"'");if(!e.isFunction(h[c]))return e.error("no such method '"+c+"' for "+a+" widget instance");var i=h[c].apply(h,f);if(i!==h&&i!==k){g=i;return false}}):this.each(function(){var h=e.data(this,a);h?h.option(c||{})._init():e.data(this,a,new b(c,this))});return g}};e.widget.bridge("isotope",e.Isotope)})(jQuery); +(d+1));b=a[c];a[c]=a[d];a[d]=b}return a},shuffle:function(a){this.options.sortBy="shuffle";this.$allAtoms=this._shuffleArray(this.$allAtoms);this.$filteredAtoms=this._filter(this.$allAtoms);return this.reLayout(a)},destroy:function(){var a=e.extend(this.options.visibleStyle,{position:"relative",top:"auto",left:"auto"});if(this.usingTransforms)a[e.isoTransform.transformProp]="none";this.$allAtoms.css(a).removeClass(this.options.hiddenClass);this.element.css({width:"auto",height:"auto"}).unbind(".isotope").removeClass(this.options.containerClass).removeData("isotope"); +e(window).unbind(".isotope")},_getSegments:function(a,b){var c=b?"rowHeight":"columnWidth",d=b?"height":"width",f=b?"rows":"cols";this[a][c]=this.options[a]&&this.options[a][c]||this.$allAtoms["outer"+(b?"Height":"Width")](true);if(!this[a][c]){e.error(c+" calculated to be zero. Stopping Isotope plugin before divide by zero. Check that the width of first child inside the isotope container is not zero.");return this}this[d]=this.element[d]();this[a][f]=Math.floor(this[d]/this[a][c]);this[a][f]=Math.max(this[a][f], +1);return this},_masonryPlaceBrick:function(a,b,c){b=Math.min.apply(Math,c);for(var d=b+a.outerHeight(true),f=c.length,g=f,h=this.masonry.cols+1-f;f--;)if(c[f]===b)g=f;this._pushPosition(a,this.masonry.columnWidth*g+this.posLeft,b);for(f=0;fb.width){b.fitRows.x=0;b.fitRows.y=b.fitRows.height}b._pushPosition(c,b.fitRows.x+b.posLeft,b.fitRows.y+b.posTop);b.fitRows.height=Math.max(b.fitRows.y+f,b.fitRows.height);b.fitRows.x+=d})},_fitRowsReset:function(){this.fitRows={x:0,y:0,height:0};return this},_fitRowsGetContainerSize:function(){return{height:this.fitRows.height}}, +_fitRowsResize:function(){return this.reLayout()},_cellsByRowReset:function(){this.cellsByRow={};this._getSegments("cellsByRow");this.cellsByRow.rowHeight=this.options.cellsByRow.rowHeight||this.$allAtoms.outerHeight(true);return this},_cellsByRowLayout:function(a){var b=this,c=this.cellsByRow.cols;this.cellsByRow.atomsLen=a.length;a.each(function(d){var f=e(this),g=(d%c+0.5)*b.cellsByRow.columnWidth-f.outerWidth(true)/2+b.posLeft;d=(~~(d/c)+0.5)*b.cellsByRow.rowHeight-f.outerHeight(true)/2+b.posTop; +b._pushPosition(f,g,d)});return this},_cellsByRowGetContainerSize:function(){return{height:Math.ceil(this.cellsByRow.atomsLen/this.cellsByRow.cols)*this.cellsByRow.rowHeight+this.posTop}},_cellsByRowResize:function(){var a=this.cellsByRow.cols;this._getSegments("cellsByRow");this.cellsByRow.cols!==a&&this.reLayout();return this},_straightDownReset:function(){this.straightDown={y:0};return this},_straightDownLayout:function(a){var b=this;a.each(function(){var c=e(this);b._pushPosition(c,b.posLeft, +b.straightDown.y+b.posTop);b.straightDown.y+=c.outerHeight(true)});return this},_straightDownGetContainerSize:function(){return{height:this.straightDown.y+this.posTop}},_straightDownResize:function(){this.reLayout();return this},_masonryHorizontalPlaceBrick:function(a,b,c){b=Math.min.apply(Math,c);for(var d=b+a.outerWidth(true),f=c.length,g=f,h=this.masonryHorizontal.rows+1-f;f--;)if(c[f]===b)g=f;this._pushPosition(a,b,this.masonryHorizontal.rowHeight*g+this.posTop);for(f=0;fb.height){b.fitColumns.x=b.fitColumns.width;b.fitColumns.y=0}b._pushPosition(c,b.fitColumns.x+b.posLeft,b.fitColumns.y+b.posTop);b.fitColumns.width=Math.max(b.fitColumns.x+d,b.fitColumns.width);b.fitColumns.y+=f})},_fitColumnsGetContainerSize:function(){return{width:this.fitColumns.width}}, +_fitColumnsResize:function(){return this.reLayout()},_cellsByColumnReset:function(){this.cellsByColumn={};this._getSegments("cellsByColumn",true);this.cellsByColumn.columnWidth=this.options.cellsByColumn.columnWidth||this.$allAtoms.outerHeight(true);return this},_cellsByColumnLayout:function(a){var b=this,c=this.cellsByColumn.rows;this.cellsByColumn.atomsLen=a.length;a.each(function(d){var f=e(this),g=(~~(d/c)+0.5)*b.cellsByColumn.columnWidth-f.outerWidth(true)/2+b.posLeft;d=(d%c+0.5)*b.cellsByColumn.rowHeight- +f.outerHeight(true)/2+b.posTop;b._pushPosition(f,g,d)});return this},_cellsByColumnGetContainerSize:function(){return{width:Math.ceil(this.cellsByColumn.atomsLen/this.cellsByColumn.rows)*this.cellsByColumn.columnWidth+this.posLeft}},_cellsByColumnResize:function(){var a=this.cellsByColumn.rows;this._getSegments("cellsByColumn",true);this.cellsByColumn.rows!==a&&this.reLayout();return this}};e.fn.imagesLoaded=function(a){var b=this.find("img"),c=b.length,d=this;b.bind("load",function(){--c<=0&&a.call(d)}).each(function(){if(this.complete|| +this.complete===k){var f=this.src;this.src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==";this.src=f}});return this};e.widget=e.widget||{};e.widget.bridge=e.widget.bridge||function(a,b){e.fn[a]=function(c){var d=typeof c==="string",f=Array.prototype.slice.call(arguments,1),g=this;c=!d&&f.length?e.extend.apply(null,[true,c].concat(f)):c;if(d&&c.charAt(0)==="_")return g;d?this.each(function(){var h=e.data(this,a);if(!h)return e.error("cannot call methods on "+a+" prior to initialization; attempted to call method '"+ +c+"'");if(!e.isFunction(h[c]))return e.error("no such method '"+c+"' for "+a+" widget instance");var i=h[c].apply(h,f);if(i!==h&&i!==k){g=i;return false}}):this.each(function(){var h=e.data(this,a);h?h.option(c||{})._init():e.data(this,a,new b(c,this))});return g}};e.widget.bridge("isotope",e.Isotope)})(jQuery);