library-mirrors/tablesorter
1
0
Fork 0
mirror of https://github.com/Mottie/tablesorter.git synced 2024-11-15 23:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Core: Ignore clicks on disabled colspan headers. Fixes #1550

Browse Source 
Changes related to #1524
This commit is contained in:
Rob Garrison 2018-05-28 15:15:07 -05:00
parent d758166865
commit 213747fc6b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/jquery.tablesorter.js
View File

@ -506,10 +506,13 @@
return;
}
downTarget = null;
$cell = ts.getClosest( $( this ), '.' + ts.css.header );
// prevent sort being triggered on form elements
if ( ts.regex.formElements.test( e.target.nodeName ) ||
// nosort class name, or elements within a nosort container
$target.hasClass( c.cssNoSort ) || $target.parents( '.' + c.cssNoSort ).length > 0 ||
// disabled cell directly clicked
$cell.hasClass( 'sorter-false' ) ||
// elements within a button
$target.parents( 'button' ).length > 0 ) {
return !c.cancelSelection;
@ -517,7 +520,6 @@
if ( c.delayInit && ts.isEmptyObject( c.cache ) ) {
ts.buildCache( c );
}
$cell = ts.getClosest( $( this ), '.' + ts.css.header );
// use column index from data-attribute or index of current row; fixes #1116
c.last.clickedIndex = $cell.attr( 'data-column' ) || $cell.index();
cell = c.$headerIndexed[ c.last.clickedIndex ][0];