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

New: sDefaultContent property for aoColumns / aoColumDefs. This new property allows a default value to be given for a column's data, and will be used whenever a null data source is encountered (this can be because mDataProp is set to null, or because the data source itself is null). In addition to this, when set if the mDataProp value is undefined, the default will be used instead (and no error given). If sDefaultContent is not set (default is null), and the mDataProp value is undefined, an error will be given as it currently is.

Browse Source
This commit is contained in:
Allan Jardine 2011-05-09 19:07:16 +01:00
parent 341f6784f6
commit 3464502c06
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2539,6 +2539,7 @@
"fnGetData": null,
"fnSetData": null,
"sSortDataType": 'std',
"sDefaultContent": null,
"nTh": nTh ? nTh : document.createElement('th'),
"nTf": null
};
@ -2607,6 +2608,7 @@
_fnMap( oCol, oOptions, "mDataProp" );
_fnMap( oCol, oOptions, "asSorting" );
_fnMap( oCol, oOptions, "sSortDataType" );
_fnMap( oCol, oOptions, "sDefaultContent" );
}
/* Cache the data get and set functions for speed */
@ -6517,16 +6519,23 @@
if ( (sData=oCol.fnGetData( oData )) === undefined )
{
if ( oSettings.iDrawError != oSettings.iDraw )
if ( oSettings.iDrawError != oSettings.iDraw && oCol.sDefaultContent === null )
{
_fnLog( oSettings, 0, "Requested unknown parameter '"+oCol.mDataProp+
"' from the data source for row "+iRow );
oSettings.iDrawError = oSettings.iDraw;
return '';
}
return oCol.sDefaultContent;
}
if ( sSpecific == 'display' && sData === null ) {
/* When the data source is null, we can use default column data */
if ( sData === null && oCol.sDefaultContent !== null )
{
sData = oCol.sDefaultContent;
}
if ( sSpecific == 'display' && sData === null )
{
return '';
}
return sData;
@ -6562,7 +6571,7 @@
{
/* Give an empty string for rendering / sorting etc */
return function (data) {
return '';
return null;
};
}
else if ( typeof sSource == 'string' && sSource.indexOf('.') != -1 )