diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index e4bd1cae..27d485a8 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -124,22 +124,8 @@ oCol._bAutoType = false; } - _fnMap( oCol, oOptions, "bVisible" ); - _fnMap( oCol, oOptions, "bSearchable" ); - _fnMap( oCol, oOptions, "bSortable" ); - _fnMap( oCol, oOptions, "sTitle" ); - _fnMap( oCol, oOptions, "sName" ); - _fnMap( oCol, oOptions, "sWidth" ); + $.extend( oCol, oOptions ); _fnMap( oCol, oOptions, "sWidth", "sWidthOrig" ); - _fnMap( oCol, oOptions, "sClass" ); - _fnMap( oCol, oOptions, "fnRender" ); - _fnMap( oCol, oOptions, "fnCreatedCell" ); - _fnMap( oCol, oOptions, "bUseRendered" ); - _fnMap( oCol, oOptions, "mDataProp" ); - _fnMap( oCol, oOptions, "asSorting" ); - _fnMap( oCol, oOptions, "sSortDataType" ); - _fnMap( oCol, oOptions, "sDefaultContent" ); - _fnMap( oCol, oOptions, "sContentPadding" ); /* iDataSort to be applied (backwards compatibility), but aDataSort will take * priority if defined diff --git a/media/src/core/core.columns.js b/media/src/core/core.columns.js index 709bfc7f..0fd2c0f8 100644 --- a/media/src/core/core.columns.js +++ b/media/src/core/core.columns.js @@ -64,22 +64,8 @@ function _fnColumnOptions( oSettings, iCol, oOptions ) oCol._bAutoType = false; } - _fnMap( oCol, oOptions, "bVisible" ); - _fnMap( oCol, oOptions, "bSearchable" ); - _fnMap( oCol, oOptions, "bSortable" ); - _fnMap( oCol, oOptions, "sTitle" ); - _fnMap( oCol, oOptions, "sName" ); - _fnMap( oCol, oOptions, "sWidth" ); + $.extend( oCol, oOptions ); _fnMap( oCol, oOptions, "sWidth", "sWidthOrig" ); - _fnMap( oCol, oOptions, "sClass" ); - _fnMap( oCol, oOptions, "fnRender" ); - _fnMap( oCol, oOptions, "fnCreatedCell" ); - _fnMap( oCol, oOptions, "bUseRendered" ); - _fnMap( oCol, oOptions, "mDataProp" ); - _fnMap( oCol, oOptions, "asSorting" ); - _fnMap( oCol, oOptions, "sSortDataType" ); - _fnMap( oCol, oOptions, "sDefaultContent" ); - _fnMap( oCol, oOptions, "sContentPadding" ); /* iDataSort to be applied (backwards compatibility), but aDataSort will take * priority if defined