diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index ce683e06..365d535f 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -3306,6 +3306,8 @@ nScrollHeadTable.style.width = _fnStringToCss( iOuterWidth ); nScrollHeadInner.style.width = _fnStringToCss( iOuterWidth ); + // Figure out if there are scrollbar present - if so then we need a the header and footer to + // provide a bit more space to allow "overflow" scrolling (i.e. past the scrollbar) var bScrolling = $(o.nTable).height() > nScrollBody.clientHeight || $(nScrollBody).css('overflow-y') == "scroll"; nScrollHeadInner.style.paddingRight = bScrolling ? o.oScroll.iBarWidth+"px" : "0px"; @@ -9744,9 +9746,10 @@ *
  • string - read an object property from the data source. Note that you can * use Javascript dotted notation to read deep properties/arrays from the * data source.
  • - *
  • null - the sDafaultContent option will use used for the cell (empty - * string by default. This can be useful on generated columns such as - * edit / delete action columns.
  • + *
  • null - the sDefaultContent option will be used for the cell (null + * by default, so you will need to specify the default content you want - + * typically an empty string). This can be useful on generated columns such + * as edit / delete action columns.
  • *
  • function - the function given will be executed whenever DataTables * needs to set or get the data for a cell in the column. The function * takes three parameters: diff --git a/media/src/model/model.defaults.columns.js b/media/src/model/model.defaults.columns.js index adb2acde..ef1c3cdd 100644 --- a/media/src/model/model.defaults.columns.js +++ b/media/src/model/model.defaults.columns.js @@ -345,9 +345,10 @@ DataTable.defaults.columns = { *
  • string - read an object property from the data source. Note that you can * use Javascript dotted notation to read deep properties/arrays from the * data source.
  • - *
  • null - the sDafaultContent option will use used for the cell (empty - * string by default. This can be useful on generated columns such as - * edit / delete action columns.
  • + *
  • null - the sDefaultContent option will be used for the cell (null + * by default, so you will need to specify the default content you want - + * typically an empty string). This can be useful on generated columns such + * as edit / delete action columns.
  • *
  • function - the function given will be executed whenever DataTables * needs to set or get the data for a cell in the column. The function * takes three parameters: