mirror of
https://github.com/DataTables/DataTables.git
synced 2024-11-29 11:24:10 +01:00
Language options always get extended with the initalisation object now - this allows you to use both a file source and the local script if you wanted. It also allows backwards compatiablity with language files that don't have the oAria namespace.
This commit is contained in:
parent
27488c4093
commit
b235c64c2a
3
media/js/jquery.dataTables.js
vendored
3
media/js/jquery.dataTables.js
vendored
@ -6177,8 +6177,7 @@
|
||||
oSettings.oLanguage.sUrl = oInit.oLanguage.sUrl;
|
||||
$.getJSON( oSettings.oLanguage.sUrl, null, function( json ) {
|
||||
_fnLanguageCompat( json );
|
||||
$.extend( true, oSettings.oLanguage, json );
|
||||
console.log( oSettings.oLanguage);
|
||||
$.extend( true, oSettings.oLanguage, oInit.oLanguage, json );
|
||||
_fnInitialise( oSettings );
|
||||
} );
|
||||
bInitHandedOff = true;
|
||||
|
@ -249,8 +249,7 @@ if ( oInit.oLanguage.sUrl !== "" )
|
||||
oSettings.oLanguage.sUrl = oInit.oLanguage.sUrl;
|
||||
$.getJSON( oSettings.oLanguage.sUrl, null, function( json ) {
|
||||
_fnLanguageCompat( json );
|
||||
$.extend( true, oSettings.oLanguage, json );
|
||||
console.log( oSettings.oLanguage);
|
||||
$.extend( true, oSettings.oLanguage, oInit.oLanguage, json );
|
||||
_fnInitialise( oSettings );
|
||||
} );
|
||||
bInitHandedOff = true;
|
||||
|
Loading…
Reference in New Issue
Block a user