diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index f13d79c1..21be65ba 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -70,32 +70,14 @@ function _fnAddColumn( oSettings, nTh ) { var iCol = oSettings.aoColumns.length; - var oCol = { - "sType": null, - "_bAutoType": true, - "bVisible": true, - "bSearchable": true, - "bSortable": true, - "asSorting": [ 'asc', 'desc' ], + var oCol = $.extend( {}, DataTable.models.oColumn, { "sSortingClass": oSettings.oClasses.sSortable, "sSortingClassJUI": oSettings.oClasses.sSortJUI, "sTitle": nTh ? nTh.innerHTML : '', - "sName": '', - "sWidth": null, - "sWidthOrig": null, - "sClass": null, - "fnRender": null, - "bUseRendered": true, "aDataSort": [ iCol ], "mDataProp": iCol, - "fnGetData": null, - "fnSetData": null, - "sSortDataType": 'std', - "sDefaultContent": null, - "sContentPadding": "", - "nTh": nTh ? nTh : document.createElement('th'), - "nTf": null - }; + "nTh": nTh ? nTh : document.createElement('th') + } ); oSettings.aoColumns.push( oCol ); /* Add a column specific filter */ @@ -4725,7 +4707,7 @@ oOpts = $.extend( {}, { "filter": "none", // applied "order": "current", // "original" - "page": "all", // current + "page": "all" // current }, oOpts ); // 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" }, diff --git a/media/src/api/api.methods.js b/media/src/api/api.methods.js index ef3b6b2c..9c2dac5a 100644 --- a/media/src/api/api.methods.js +++ b/media/src/api/api.methods.js @@ -47,7 +47,7 @@ this.$ = function ( sSelector, oOpts ) oOpts = $.extend( {}, { "filter": "none", // applied "order": "current", // "original" - "page": "all", // current + "page": "all" // current }, oOpts ); // Current page implies that order=current and fitler=applied, since it is fairly diff --git a/media/src/core/core.columns.js b/media/src/core/core.columns.js index 35308802..33835014 100644 --- a/media/src/core/core.columns.js +++ b/media/src/core/core.columns.js @@ -9,32 +9,14 @@ function _fnAddColumn( oSettings, nTh ) { var iCol = oSettings.aoColumns.length; - var oCol = { - "sType": null, - "_bAutoType": true, - "bVisible": true, - "bSearchable": true, - "bSortable": true, - "asSorting": [ 'asc', 'desc' ], + var oCol = $.extend( {}, DataTable.models.oColumn, { "sSortingClass": oSettings.oClasses.sSortable, "sSortingClassJUI": oSettings.oClasses.sSortJUI, "sTitle": nTh ? nTh.innerHTML : '', - "sName": '', - "sWidth": null, - "sWidthOrig": null, - "sClass": null, - "fnRender": null, - "bUseRendered": true, "aDataSort": [ iCol ], "mDataProp": iCol, - "fnGetData": null, - "fnSetData": null, - "sSortDataType": 'std', - "sDefaultContent": null, - "sContentPadding": "", - "nTh": nTh ? nTh : document.createElement('th'), - "nTf": null - }; + "nTh": nTh ? nTh : document.createElement('th') + } ); oSettings.aoColumns.push( oCol ); /* Add a column specific filter */ diff --git a/media/src/model/model.init.js b/media/src/model/model.init.js index 3c43b734..52a34f0c 100644 --- a/media/src/model/model.init.js +++ b/media/src/model/model.init.js @@ -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" },