1
0
mirror of https://github.com/DataTables/DataTables.git synced 2025-01-30 23:52:11 +01:00

Remove trailing commas!

This commit is contained in:
Allan Jardine 2011-12-06 16:44:17 +00:00
parent 923c640298
commit a22727c84b
4 changed files with 12 additions and 48 deletions

View File

@ -70,32 +70,14 @@
function _fnAddColumn( oSettings, nTh ) function _fnAddColumn( oSettings, nTh )
{ {
var iCol = oSettings.aoColumns.length; var iCol = oSettings.aoColumns.length;
var oCol = { var oCol = $.extend( {}, DataTable.models.oColumn, {
"sType": null,
"_bAutoType": true,
"bVisible": true,
"bSearchable": true,
"bSortable": true,
"asSorting": [ 'asc', 'desc' ],
"sSortingClass": oSettings.oClasses.sSortable, "sSortingClass": oSettings.oClasses.sSortable,
"sSortingClassJUI": oSettings.oClasses.sSortJUI, "sSortingClassJUI": oSettings.oClasses.sSortJUI,
"sTitle": nTh ? nTh.innerHTML : '', "sTitle": nTh ? nTh.innerHTML : '',
"sName": '',
"sWidth": null,
"sWidthOrig": null,
"sClass": null,
"fnRender": null,
"bUseRendered": true,
"aDataSort": [ iCol ], "aDataSort": [ iCol ],
"mDataProp": iCol, "mDataProp": iCol,
"fnGetData": null, "nTh": nTh ? nTh : document.createElement('th')
"fnSetData": null, } );
"sSortDataType": 'std',
"sDefaultContent": null,
"sContentPadding": "",
"nTh": nTh ? nTh : document.createElement('th'),
"nTf": null
};
oSettings.aoColumns.push( oCol ); oSettings.aoColumns.push( oCol );
/* Add a column specific filter */ /* Add a column specific filter */
@ -4725,7 +4707,7 @@
oOpts = $.extend( {}, { oOpts = $.extend( {}, {
"filter": "none", // applied "filter": "none", // applied
"order": "current", // "original" "order": "current", // "original"
"page": "all", // current "page": "all" // current
}, oOpts ); }, oOpts );
// Current page implies that order=current and fitler=applied, since it is fairly // Current page implies that order=current and fitler=applied, since it is fairly
@ -8444,7 +8426,7 @@
* } ); * } );
* } ); * } );
*/ */
"sPrevious": "Previous", "sPrevious": "Previous"
}, },
/** /**
@ -8711,7 +8693,7 @@
* } ); * } );
* } ); * } );
*/ */
"sZeroRecords": "No matching records found", "sZeroRecords": "No matching records found"
}, },

View File

@ -47,7 +47,7 @@ this.$ = function ( sSelector, oOpts )
oOpts = $.extend( {}, { oOpts = $.extend( {}, {
"filter": "none", // applied "filter": "none", // applied
"order": "current", // "original" "order": "current", // "original"
"page": "all", // current "page": "all" // current
}, oOpts ); }, oOpts );
// Current page implies that order=current and fitler=applied, since it is fairly // Current page implies that order=current and fitler=applied, since it is fairly

View File

@ -9,32 +9,14 @@
function _fnAddColumn( oSettings, nTh ) function _fnAddColumn( oSettings, nTh )
{ {
var iCol = oSettings.aoColumns.length; var iCol = oSettings.aoColumns.length;
var oCol = { var oCol = $.extend( {}, DataTable.models.oColumn, {
"sType": null,
"_bAutoType": true,
"bVisible": true,
"bSearchable": true,
"bSortable": true,
"asSorting": [ 'asc', 'desc' ],
"sSortingClass": oSettings.oClasses.sSortable, "sSortingClass": oSettings.oClasses.sSortable,
"sSortingClassJUI": oSettings.oClasses.sSortJUI, "sSortingClassJUI": oSettings.oClasses.sSortJUI,
"sTitle": nTh ? nTh.innerHTML : '', "sTitle": nTh ? nTh.innerHTML : '',
"sName": '',
"sWidth": null,
"sWidthOrig": null,
"sClass": null,
"fnRender": null,
"bUseRendered": true,
"aDataSort": [ iCol ], "aDataSort": [ iCol ],
"mDataProp": iCol, "mDataProp": iCol,
"fnGetData": null, "nTh": nTh ? nTh : document.createElement('th')
"fnSetData": null, } );
"sSortDataType": 'std',
"sDefaultContent": null,
"sContentPadding": "",
"nTh": nTh ? nTh : document.createElement('th'),
"nTf": null
};
oSettings.aoColumns.push( oCol ); oSettings.aoColumns.push( oCol );
/* Add a column specific filter */ /* Add a column specific filter */

View File

@ -1159,7 +1159,7 @@ DataTable.models.oInit = {
* } ); * } );
* } ); * } );
*/ */
"sPrevious": "Previous", "sPrevious": "Previous"
}, },
/** /**
@ -1426,7 +1426,7 @@ DataTable.models.oInit = {
* } ); * } );
* } ); * } );
*/ */
"sZeroRecords": "No matching records found", "sZeroRecords": "No matching records found"
}, },