rooty/DataTables
1
0
Fork 0
mirror of https://github.com/DataTables/DataTables.git synced 2024-12-01 13:24:10 +01:00
Code Issues Releases Activity

Changed: Use $.extend for the language options - its quicker and easier! The init options should be done like this as well, but that will likely be 2.0 due to the way it is currently implemented...

Browse Source
This commit is contained in:
Allan Jardine 2011-08-30 18:27:12 +01:00
parent e87798781b
commit 4708870aa0
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2473,25 +2473,7 @@
*/
function _fnLanguageProcess( oSettings, oLanguage, bInit )
{
_fnMap( oSettings.oLanguage, oLanguage, 'sProcessing' );
_fnMap( oSettings.oLanguage, oLanguage, 'sLengthMenu' );
_fnMap( oSettings.oLanguage, oLanguage, 'sEmptyTable' );
_fnMap( oSettings.oLanguage, oLanguage, 'sLoadingRecords' );
_fnMap( oSettings.oLanguage, oLanguage, 'sZeroRecords' );
_fnMap( oSettings.oLanguage, oLanguage, 'sInfo' );
_fnMap( oSettings.oLanguage, oLanguage, 'sInfoEmpty' );
_fnMap( oSettings.oLanguage, oLanguage, 'sInfoFiltered' );
_fnMap( oSettings.oLanguage, oLanguage, 'sInfoPostFix' );
_fnMap( oSettings.oLanguage, oLanguage, 'sInfoThousands' );
_fnMap( oSettings.oLanguage, oLanguage, 'sSearch' );
if ( typeof oLanguage.oPaginate != 'undefined' )
{
_fnMap( oSettings.oLanguage.oPaginate, oLanguage.oPaginate, 'sFirst' );
_fnMap( oSettings.oLanguage.oPaginate, oLanguage.oPaginate, 'sPrevious' );
_fnMap( oSettings.oLanguage.oPaginate, oLanguage.oPaginate, 'sNext' );
_fnMap( oSettings.oLanguage.oPaginate, oLanguage.oPaginate, 'sLast' );
}
oSettings.oLanguage = $.extend( true, oSettings.oLanguage, oLanguage );
/* Backwards compatibility - if there is no sEmptyTable given, then use the same as
* sZeroRecords - assuming that is given.