diff --git a/.datatables-commit-sync b/.datatables-commit-sync index d5c76989..68efe10a 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -7af80a12efe4be1d7426868b736c93afc8dc0ded +27bfabdcecb11ea4891db9e8ff07eca4a2b5673e diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index 441b8a61..9ea93158 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -344,12 +344,19 @@ if ( hungarianKey !== undefined && (force || user[hungarianKey] === undefined) ) { + // For objects, we need to buzz down into the object to copy parameters if ( hungarianKey.charAt(0) === 'o' ) { - _fnCamelToHungarian( src[hungarianKey], user[key] ); + // Copy the camelCase options over to the hungarian + if ( ! user[ hungarianKey ] ) { + user[ hungarianKey ] = {}; + } + $.extend( true, user[hungarianKey], user[key] ); + + _fnCamelToHungarian( src[hungarianKey], user[hungarianKey], force ); } else { - src[hungarianKey] = user[ key ]; + user[hungarianKey] = user[ key ]; } } } );