rooty/DataTables
1
0
Fork 0
mirror of https://github.com/DataTables/DataTables.git synced 2025-01-19 12:52:11 +01:00
Code Issues Releases Activity

Fix: The ability to use complex data structures in 1.8 means that arrays which are passed into to fnUpdate need not strictly be the same length as the number of columns in the table - therefore the warning that is given if you do this is wrong... no other code changes needed - just no need to generate the warning! Unit test added - 5396

Browse Source
This commit is contained in:
Allan Jardine 2011-06-21 18:38:00 +01:00
parent bb26e08b4e
commit aaf9697bd6
2 changed files with 103 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1926,13 +1926,6 @@
if ( $.isArray(mData) && typeof mData == 'object' )
{
/* Array update - update the whole row */
if ( mData.length != oSettings.aoColumns.length )
{
_fnLog( oSettings, 0, 'An array passed to fnUpdate must have the same number of '+
'columns as the table in question - in this case '+oSettings.aoColumns.length );
return 1;
}
oSettings.aoData[iRow]._aData = mData.slice();
for ( i=0 ; i<oSettings.aoColumns.length ; i++ )

103
media/unit_testing/tests_onhold/1_dom/5396-fnUpdate-arrays.js Executable file
View File

@ -0,0 +1,103 @@
// DATA_TEMPLATE: empty_table
oTest.fnStart( "5396 - fnUpdate with 2D arrays for a single row" );
$(document).ready( function () {
$('#example thead tr').append( '<th>6</th>' );
$('#example thead tr').append( '<th>7</th>' );
$('#example thead tr').append( '<th>8</th>' );
$('#example thead tr').append( '<th>9</th>' );
$('#example thead tr').append( '<th>10</th>' );
var aDataSet = [
[
"1",
"홍길동",
"1154315",
"etc1",
[
[ "test1@daum.net", "2011-03-04" ],
[ "test1@naver.com", "2009-07-06" ],
[ "test4@naver.com", ",hide" ],
[ "test5?@naver.com", "" ]
],
"2011-03-04",
"show"
],
[
"2",
"홍길순",
"2154315",
"etc2",
[
[ "test2@daum.net", "2009-09-26" ],
[ "test2@naver.com", "2009-05-21,hide" ],
[ "lsb@naver.com", "2010-03-05" ],
[ "lsb3@naver.com", ",hide" ],
[ "sooboklee9@daum.net", "2010-03-05" ]
],
"2010-03-05",
"show"
]
]
var oTable = $('#example').dataTable({
"aaData": aDataSet,
"aoColumns": [
{ "mDataProp": "0"},
{ "mDataProp": "1"},
{ "mDataProp": "2"},
{ "mDataProp": "3"},
{ "mDataProp": "4.0.0"},
{ "mDataProp": "4.0.1"},
{ "mDataProp": "4.1.0"},
{ "mDataProp": "4.1.1"},
{ "mDataProp": "5"},
{ "mDataProp": "6"}
]
});
oTest.fnTest(
"Initialisation",
null,
function () {
return $('#example tbody tr:eq(0) td:eq(0)').html() == '1';
}
);
oTest.fnTest(
"Update row",
function () {
$('#example').dataTable().fnUpdate( [
"0",
"홍길순",
"2154315",
"etc2",
[
[ "test2@daum.net", "2009-09-26" ],
[ "test2@naver.com", "2009-05-21,hide" ],
[ "lsb@naver.com", "2010-03-05" ],
[ "lsb3@naver.com", ",hide" ],
[ "sooboklee9@daum.net", "2010-03-05" ]
],
"2010-03-05",
"show"
], 1 );
},
function () {
return $('#example tbody tr:eq(0) td:eq(0)').html() == '0';
}
);
oTest.fnTest(
"Original row preserved",
null,
function () {
return $('#example tbody tr:eq(1) td:eq(0)').html() == '1';
}
);
oTest.fnComplete();
} );