diff --git a/.datatables-commit-sync b/.datatables-commit-sync index e29d7236..a4e55d83 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -d214c81afce3a8f594dac5102b473c451162789f +22eb613114730631469410198ef1d44ffdb11176 diff --git a/media/css/jquery.dataTables.css b/media/css/jquery.dataTables.css index 516e4d07..c56e4287 100644 --- a/media/css/jquery.dataTables.css +++ b/media/css/jquery.dataTables.css @@ -354,6 +354,13 @@ table.dataTable td { *margin-top: -1px; -webkit-overflow-scrolling: touch; } +.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody th > div.dataTables_sizing, +.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody td > div.dataTables_sizing { + height: 0; + overflow: hidden; + margin: 0 !important; + padding: 0 !important; +} .dataTables_wrapper.no-footer .dataTables_scrollBody { border-bottom: 1px solid #111111; } diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index 3157ece8..843a2d19 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -1,15 +1,15 @@ -/*! DataTables 1.10.0-dev - * ©2008-2013 SpryMedia Ltd - datatables.net/license +/*! DataTables 1.10.0-beta.2.dev + * ©2008-2014 SpryMedia Ltd - datatables.net/license */ /** * @summary DataTables * @description Paginate, search and order HTML tables - * @version 1.10.0-dev + * @version 1.10.0-beta.2.dev * @file jquery.dataTables.js * @author SpryMedia Ltd (www.sprymedia.co.uk) * @contact www.sprymedia.co.uk/contact - * @copyright Copyright 2008-2013 SpryMedia Ltd. + * @copyright Copyright 2008-2014 SpryMedia Ltd. * * This source file is free software, available under the following license: * MIT license - http://datatables.net/license @@ -2552,27 +2552,33 @@ } ) .append( $('