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

Dev fix: When using _fnExtend to extend with an object, need to check if

Browse Source 
the property being expanded is an object or not. If not, then set it to
be an empty object which will be extended. Only really effected the
`ajax` property
This commit is contained in:
Allan Jardine 2013-12-09 12:52:06 +00:00
parent 7e67778c51
commit 18c53eaed5
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.datatables-commit-sync
View File

@ -1 +1 @@
6ebbd9f27a5103b45caa08cd1fce4ee9b0b7f1a6
118619e940c35fea478e5bfe6c3ebc66d8c83923

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

@ -4687,6 +4687,9 @@
val = extender[prop];
if ( $.isPlainObject( val ) ) {
if ( ! $.isPlainObject( out[prop] ) ) {
out[prop] = {};
}
$.extend( true, out[prop], val );
}
else if ( breakRefs && prop !== 'data' && prop !== 'aaData' && $.isArray(val) ) {