- update
This commit is contained in:
parent
05cf48534a
commit
83558f7bce
173 changed files with 1289 additions and 9312 deletions
34
_site/bower_components/isotope/js/isotope.js
vendored
34
_site/bower_components/isotope/js/isotope.js
vendored
|
|
@ -1,11 +1,11 @@
|
|||
/*!
|
||||
* Isotope v3.0.1
|
||||
* Isotope v3.0.6
|
||||
*
|
||||
* Licensed GPLv3 for open source use
|
||||
* or Isotope Commercial License for commercial use
|
||||
*
|
||||
* http://isotope.metafizzy.co
|
||||
* Copyright 2016 Metafizzy
|
||||
* https://isotope.metafizzy.co
|
||||
* Copyright 2010-2018 Metafizzy
|
||||
*/
|
||||
|
||||
( function( window, factory ) {
|
||||
|
|
@ -402,20 +402,28 @@ var trim = String.prototype.trim ?
|
|||
|
||||
// sort filteredItem order
|
||||
proto._sort = function() {
|
||||
var sortByOpt = this.options.sortBy;
|
||||
if ( !sortByOpt ) {
|
||||
if ( !this.options.sortBy ) {
|
||||
return;
|
||||
}
|
||||
// concat all sortBy and sortHistory
|
||||
var sortBys = [].concat.apply( sortByOpt, this.sortHistory );
|
||||
// sort magic
|
||||
var itemSorter = getItemSorter( sortBys, this.options.sortAscending );
|
||||
this.filteredItems.sort( itemSorter );
|
||||
// keep track of sortBy History
|
||||
if ( sortByOpt != this.sortHistory[0] ) {
|
||||
// add to front, oldest goes in last
|
||||
this.sortHistory.unshift( sortByOpt );
|
||||
var sortBys = utils.makeArray( this.options.sortBy );
|
||||
if ( !this._getIsSameSortBy( sortBys ) ) {
|
||||
// concat all sortBy and sortHistory, add to front, oldest goes in last
|
||||
this.sortHistory = sortBys.concat( this.sortHistory );
|
||||
}
|
||||
// sort magic
|
||||
var itemSorter = getItemSorter( this.sortHistory, this.options.sortAscending );
|
||||
this.filteredItems.sort( itemSorter );
|
||||
};
|
||||
|
||||
// check if sortBys is same as start of sortHistory
|
||||
proto._getIsSameSortBy = function( sortBys ) {
|
||||
for ( var i=0; i < sortBys.length; i++ ) {
|
||||
if ( sortBys[i] != this.sortHistory[i] ) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
};
|
||||
|
||||
// returns a function used for sorting
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/*!
|
||||
* Masonry layout mode
|
||||
* sub-classes Masonry
|
||||
* http://masonry.desandro.com
|
||||
* https://masonry.desandro.com
|
||||
*/
|
||||
|
||||
( function( window, factory ) {
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
// AMD
|
||||
define( [
|
||||
'../layout-mode',
|
||||
'masonry/masonry'
|
||||
'masonry-layout/masonry'
|
||||
],
|
||||
factory );
|
||||
} else if ( typeof module == 'object' && module.exports ) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue