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

Dev fix: Converting camelCase to hungarian was broken

Browse Source
This commit is contained in:
Allan Jardine 2014-04-01 13:43:00 +01:00
parent 1a0551fd2c
commit 6cac556b6a
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.datatables-commit-sync
View File

@ -1 +1 @@
7af80a12efe4be1d7426868b736c93afc8dc0ded 27bfabdcecb11ea4891db9e8ff07eca4a2b5673e

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

@ -344,12 +344,19 @@
if ( hungarianKey !== undefined && (force || user[hungarianKey] === undefined) ) 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' ) 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 { else {
src[hungarianKey] = user[ key ]; user[hungarianKey] = user[ key ];
} }
} }
} ); } );