diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index cab4f3fb..0edc4080 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -3894,6 +3894,7 @@ for ( i=0, iLen=oSettings.aoColumns.length ; i/g, "" ); nTh = aoColumns[i].nTh; nTh.removeAttribute('aria-sort'); nTh.removeAttribute('aria-label'); @@ -3907,18 +3908,18 @@ var nextSort = (aoColumns[i].asSorting[ aaSort[0][2]+1 ]) ? aoColumns[i].asSorting[ aaSort[0][2]+1 ] : aoColumns[i].asSorting[0]; - nTh.setAttribute('aria-label', aoColumns[i].sTitle+ + nTh.setAttribute('aria-label', sTitle+ (nextSort=="asc" ? oAria.sSortAscending : oAria.sSortDescending) ); } else { - nTh.setAttribute('aria-label', aoColumns[i].sTitle+ + nTh.setAttribute('aria-label', sTitle+ (aoColumns[i].asSorting[0]=="asc" ? oAria.sSortAscending : oAria.sSortDescending) ); } } else { - nTh.setAttribute('aria-label', aoColumns[i].sTitle); + nTh.setAttribute('aria-label', sTitle); } } diff --git a/media/src/core/core.sort.js b/media/src/core/core.sort.js index 02967ad5..570fd965 100644 --- a/media/src/core/core.sort.js +++ b/media/src/core/core.sort.js @@ -134,6 +134,7 @@ function _fnSort ( oSettings, bApplyClasses ) for ( i=0, iLen=oSettings.aoColumns.length ; i/g, "" ); nTh = aoColumns[i].nTh; nTh.removeAttribute('aria-sort'); nTh.removeAttribute('aria-label'); @@ -147,18 +148,18 @@ function _fnSort ( oSettings, bApplyClasses ) var nextSort = (aoColumns[i].asSorting[ aaSort[0][2]+1 ]) ? aoColumns[i].asSorting[ aaSort[0][2]+1 ] : aoColumns[i].asSorting[0]; - nTh.setAttribute('aria-label', aoColumns[i].sTitle+ + nTh.setAttribute('aria-label', sTitle+ (nextSort=="asc" ? oAria.sSortAscending : oAria.sSortDescending) ); } else { - nTh.setAttribute('aria-label', aoColumns[i].sTitle+ + nTh.setAttribute('aria-label', sTitle+ (aoColumns[i].asSorting[0]=="asc" ? oAria.sSortAscending : oAria.sSortDescending) ); } } else { - nTh.setAttribute('aria-label', aoColumns[i].sTitle); + nTh.setAttribute('aria-label', sTitle); } }