| @@ 5997-6020 (lines=24) @@ | ||
| 5994 | // Depreciated - remove in 1.11 (providing a plug-in option) |
|
| 5995 | // Not all sort types have formatting methods, so we have to call their sorting |
|
| 5996 | // methods. |
|
| 5997 | displayMaster.sort( function ( a, b ) { |
|
| 5998 | var |
|
| 5999 | x, y, k, l, test, sort, fn, |
|
| 6000 | len=aSort.length, |
|
| 6001 | dataA = aoData[a]._aSortData, |
|
| 6002 | dataB = aoData[b]._aSortData; |
|
| 6003 | ||
| 6004 | for ( k=0 ; k<len ; k++ ) { |
|
| 6005 | sort = aSort[k]; |
|
| 6006 | ||
| 6007 | x = dataA[ sort.col ]; |
|
| 6008 | y = dataB[ sort.col ]; |
|
| 6009 | ||
| 6010 | fn = oExtSort[ sort.type+"-"+sort.dir ] || oExtSort[ "string-"+sort.dir ]; |
|
| 6011 | test = fn( x, y ); |
|
| 6012 | if ( test !== 0 ) { |
|
| 6013 | return test; |
|
| 6014 | } |
|
| 6015 | } |
|
| 6016 | ||
| 6017 | x = aiOrig[a]; |
|
| 6018 | y = aiOrig[b]; |
|
| 6019 | return x<y ? -1 : x>y ? 1 : 0; |
|
| 6020 | } ); |
|
| 6021 | } |
|
| 6022 | } |
|
| 6023 | ||
| @@ 5969-5991 (lines=23) @@ | ||
| 5966 | */ |
|
| 5967 | if ( formatters === aSort.length ) { |
|
| 5968 | // All sort types have formatting functions |
|
| 5969 | displayMaster.sort( function ( a, b ) { |
|
| 5970 | var |
|
| 5971 | x, y, k, test, sort, |
|
| 5972 | len=aSort.length, |
|
| 5973 | dataA = aoData[a]._aSortData, |
|
| 5974 | dataB = aoData[b]._aSortData; |
|
| 5975 | ||
| 5976 | for ( k=0 ; k<len ; k++ ) { |
|
| 5977 | sort = aSort[k]; |
|
| 5978 | ||
| 5979 | x = dataA[ sort.col ]; |
|
| 5980 | y = dataB[ sort.col ]; |
|
| 5981 | ||
| 5982 | test = x<y ? -1 : x>y ? 1 : 0; |
|
| 5983 | if ( test !== 0 ) { |
|
| 5984 | return sort.dir === 'asc' ? test : -test; |
|
| 5985 | } |
|
| 5986 | } |
|
| 5987 | ||
| 5988 | x = aiOrig[a]; |
|
| 5989 | y = aiOrig[b]; |
|
| 5990 | return x<y ? -1 : x>y ? 1 : 0; |
|
| 5991 | } ); |
|
| 5992 | } |
|
| 5993 | else { |
|
| 5994 | // Depreciated - remove in 1.11 (providing a plug-in option) |
|