rooty/DataTables
1
0
Fork 0
mirror of https://github.com/DataTables/DataTables.git synced 2025-02-27 00:54:15 +01:00
Code Issues Releases Activity

Only the constructor should be referring to oJUIClasses - also in the constructor copy the class object rather than referencing

Browse Source
This commit is contained in:
Allan Jardine 2011-12-14 11:15:17 +00:00
parent 2bc7cd34c9
commit 013eac9d0b
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
media/js/jquery.dataTables.js vendored
View File

@ -4126,7 +4126,7 @@
if ( oSettings.bJUI )
{
/* jQuery UI uses extra markup */
var jqSpan = $("span."+DataTable.ext.oJUIClasses.sSortIcon, oSettings.aoColumns[i].nTh);
var jqSpan = $("span."+oClasses.sSortIcon, oSettings.aoColumns[i].nTh);
jqSpan.removeClass(oClasses.sSortJUIAsc +" "+ oClasses.sSortJUIDesc +" "+
oClasses.sSortJUI +" "+ oClasses.sSortJUIAscAllowed +" "+ oClasses.sSortJUIDescAllowed );
@ -5129,11 +5129,11 @@
);
if ( oSettings.bJUI )
{
$('th span.'+DataTable.ext.oJUIClasses.sSortIcon
+ ', td span.'+DataTable.ext.oJUIClasses.sSortIcon, oSettings.nTHead).remove();
$('th span.'+oSettings.oClasses.sSortIcon
+ ', td span.'+oSettings.oClasses.sSortIcon, oSettings.nTHead).remove();
$('th, td', oSettings.nTHead).each( function () {
var jqWrapper = $('div.'+DataTable.ext.oJUIClasses.sSortJUIWrapper, this);
var jqWrapper = $('div.'+oSettings.oClasses.sSortJUIWrapper, this);
var kids = jqWrapper.contents();
$(this).append( kids );
jqWrapper.remove();
@ -6146,7 +6146,7 @@
/* Use the JUI classes object for display. You could clone the oStdClasses object if
* you want to have multiple tables with multiple independent classes
*/
oSettings.oClasses = DataTable.ext.oJUIClasses;
$.extend( oSettings.oClasses, DataTable.ext.oJUIClasses );
if ( oInit.sDom == DataTable.models.oInit.sDom )
{
@ -6156,7 +6156,7 @@
}
else
{
oSettings.oClasses = DataTable.ext.oStdClasses;
$.extend( oSettings.oClasses, DataTable.ext.oStdClasses );
}
$(this).addClass( oSettings.oClasses.sTable );

6
media/src/api/api.methods.js
View File

@ -424,11 +424,11 @@ this.fnDestroy = function ( bRemove )
);
if ( oSettings.bJUI )
{
$('th span.'+DataTable.ext.oJUIClasses.sSortIcon
+ ', td span.'+DataTable.ext.oJUIClasses.sSortIcon, oSettings.nTHead).remove();
$('th span.'+oSettings.oClasses.sSortIcon
+ ', td span.'+oSettings.oClasses.sSortIcon, oSettings.nTHead).remove();
$('th, td', oSettings.nTHead).each( function () {
var jqWrapper = $('div.'+DataTable.ext.oJUIClasses.sSortJUIWrapper, this);
var jqWrapper = $('div.'+oSettings.oClasses.sSortJUIWrapper, this);
var kids = jqWrapper.contents();
$(this).append( kids );
jqWrapper.remove();

4
media/src/core/core.constructor.js
View File

@ -189,7 +189,7 @@ if ( oInit.bJQueryUI )
/* Use the JUI classes object for display. You could clone the oStdClasses object if
* you want to have multiple tables with multiple independent classes
*/
oSettings.oClasses = DataTable.ext.oJUIClasses;
$.extend( oSettings.oClasses, DataTable.ext.oJUIClasses );
if ( oInit.sDom == DataTable.models.oInit.sDom )
{
@ -199,7 +199,7 @@ if ( oInit.bJQueryUI )
}
else
{
oSettings.oClasses = DataTable.ext.oStdClasses;
$.extend( oSettings.oClasses, DataTable.ext.oStdClasses );
}
$(this).addClass( oSettings.oClasses.sTable );

2
media/src/core/core.sort.js
View File

@ -352,7 +352,7 @@ function _fnSortingClasses( oSettings )
if ( oSettings.bJUI )
{
/* jQuery UI uses extra markup */
var jqSpan = $("span."+DataTable.ext.oJUIClasses.sSortIcon, oSettings.aoColumns[i].nTh);
var jqSpan = $("span."+oClasses.sSortIcon, oSettings.aoColumns[i].nTh);
jqSpan.removeClass(oClasses.sSortJUIAsc +" "+ oClasses.sSortJUIDesc +" "+
oClasses.sSortJUI +" "+ oClasses.sSortJUIAscAllowed +" "+ oClasses.sSortJUIDescAllowed );