This repository was archived by the owner on Jan 10, 2018. It is now read-only.
File tree Expand file tree Collapse file tree 2 files changed +7
-5
lines changed
Expand file tree Collapse file tree 2 files changed +7
-5
lines changed Original file line number Diff line number Diff line change 3232// 'desc' => '<input type="text" name="ttl" value="Test '.$i.'st row Test '.$i.'st row Test '.$i.'st row Test '.$i.'st row Test '.$i.'st row" /> ',
3333 'info ' => 'some info some info some info some info ' ,
3434 'date ' => date ('H:i:s d:m:Y ' , time () - $ i ),
35- 'field1 ' => ($ i % 5 === 0 ) ? null : $ i ,
35+ 'field1 ' => ($ i % 5 === 0 ) ? null : (( $ i % 6 === 0 ) ? 0 : $ i ) ,
3636 'field2 ' => $ i + 1234 ,
3737 'field3 ' => $ i + 12345 ,
3838 ];
Original file line number Diff line number Diff line change 357357 // ===========
358358 if ( sortingOrder === SORT_ASC_NUM ) { // asc
359359 nJson . sort ( function ( a , b ) {
360- a = ( eval ( 'a.' + cols [ idx ] . data ) === null ) ? '' : eval ( 'a.' + cols [ idx ] . data ) + '' ;
361- b = ( eval ( 'b.' + cols [ idx ] . data ) === null ) ? '' : eval ( 'b.' + cols [ idx ] . data ) + '' ;
360+ var an = eval ( 'a.' + cols [ idx ] . data ) , bn = eval ( 'b.' + cols [ idx ] . data ) ;
361+ a = ( an === null ) ? '' : an + '' ;
362+ b = ( bn === null ) ? '' : bn + '' ;
362363 if ( check === 0 ) { // check just the 1st time
363364 if ( isNaN ( a - b ) ) {
364365 isNan = 1 ;
372373 } ) ;
373374 } else { // desc
374375 nJson . sort ( function ( a , b ) {
375- a = ( eval ( 'a.' + cols [ idx ] . data ) === null ) ? '' : eval ( 'a.' + cols [ idx ] . data ) + '' ;
376- b = ( eval ( 'b.' + cols [ idx ] . data ) === null ) ? '' : eval ( 'b.' + cols [ idx ] . data ) + '' ;
376+ var an = eval ( 'a.' + cols [ idx ] . data ) , bn = eval ( 'b.' + cols [ idx ] . data ) ;
377+ a = ( an === null ) ? '' : an + '' ;
378+ b = ( bn === null ) ? '' : bn + '' ;
377379 if ( check === 0 ) { // check just the 1st time
378380 if ( isNaN ( a - b ) ) {
379381 isNan = 1 ;
You can’t perform that action at this time.
0 commit comments