rooty/DataTables
1
0
Fork 0
mirror of https://github.com/DataTables/DataTables.git synced 2025-03-15 16:29:16 +01:00
Code Issues Releases Activity

Merge branch 'master' of github.com:DataTables/DataTables

Browse Source
This commit is contained in:
Allan Jardine 2011-09-30 19:44:18 +01:00
commit 896a8dc0fc
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
media/js/jquery.dataTables.js vendored
View File

@ -1,6 +1,6 @@
/* /*
* File: jquery.dataTables.js * File: jquery.dataTables.js
* Version: 1.8.2 * Version: 1.8.3.dev
* Description: Paginate, search and sort HTML tables * Description: Paginate, search and sort HTML tables
* Author: Allan Jardine (www.sprymedia.co.uk) * Author: Allan Jardine (www.sprymedia.co.uk)
* Created: 28/3/2008 * Created: 28/3/2008
@ -67,7 +67,7 @@
* Notes: Allowed format is a.b.c.d.e where: * Notes: Allowed format is a.b.c.d.e where:
* a:int, b:int, c:int, d:string(dev|beta), e:int. d and e are optional * a:int, b:int, c:int, d:string(dev|beta), e:int. d and e are optional
*/ */
_oExt.sVersion = "1.8.2"; _oExt.sVersion = "1.8.3.dev";
/* /*
* Variable: sErrMode * Variable: sErrMode
@ -5764,7 +5764,9 @@
} }
} }
oSettings.nTable.style.width = _fnStringToCss( $(nCalcTmp).outerWidth() ); var cssWidth = $(nCalcTmp).css('width');
oSettings.nTable.style.width = (cssWidth.indexOf('%') !== -1) ?
cssWidth : _fnStringToCss( $(nCalcTmp).outerWidth() );
nCalcTmp.parentNode.removeChild( nCalcTmp ); nCalcTmp.parentNode.removeChild( nCalcTmp );
} }
} }