rooty/DataTables
1
0
Fork 0
mirror of https://github.com/DataTables/DataTables.git synced 2025-01-30 23:52:11 +01:00
Code Issues Releases Activity

Change: Add a parseInt to the two integer values that come back from server-side processing. The question about why it doesn't work when strings are returned (or rather, why is it broken) keep cropping up in the forum.

Browse Source
This commit is contained in:
Allan Jardine 2011-12-06 10:44:18 +00:00
parent 5f53331cd6
commit 77c551268e
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1554,11 +1554,11 @@
* Data the data from the server (nuking the old) and redraw the table * Data the data from the server (nuking the old) and redraw the table
* @param {object} oSettings dataTables settings object * @param {object} oSettings dataTables settings object
* @param {object} json json data return from the server. * @param {object} json json data return from the server.
* @param {object} json.sEcho Tracking flag for DataTables to match requests * @param {string} json.sEcho Tracking flag for DataTables to match requests
* @param {object} json.iTotalRecords Number of records in the data set, not accounting for filtering * @param {int} json.iTotalRecords Number of records in the data set, not accounting for filtering
* @param {object} json.iTotalDisplayRecords Number of records in the data set, accounting for filtering * @param {int} json.iTotalDisplayRecords Number of records in the data set, accounting for filtering
* @param {object} json.aaData The data to display on this page * @param {array} json.aaData The data to display on this page
* @param {object} [json.sColumns] Column ordering (sName, comma separated) * @param {string} [json.sColumns] Column ordering (sName, comma separated)
* @private * @private
*/ */
function _fnAjaxUpdateDraw ( oSettings, json ) function _fnAjaxUpdateDraw ( oSettings, json )
@ -1583,8 +1583,8 @@
{ {
_fnClearTable( oSettings ); _fnClearTable( oSettings );
} }
oSettings._iRecordsTotal = json.iTotalRecords; oSettings._iRecordsTotal = parseInt(json.iTotalRecords, 10);
oSettings._iRecordsDisplay = json.iTotalDisplayRecords; oSettings._iRecordsDisplay = parseInt(json.iTotalDisplayRecords, 10);
/* Determine if reordering is required */ /* Determine if reordering is required */
var sOrdering = _fnColumnOrdering(oSettings); var sOrdering = _fnColumnOrdering(oSettings);

14
media/src/core/core.draw.js
View File

@ -647,11 +647,11 @@ function _fnServerParams( oSettings, aoData )
* Data the data from the server (nuking the old) and redraw the table * Data the data from the server (nuking the old) and redraw the table
* @param {object} oSettings dataTables settings object * @param {object} oSettings dataTables settings object
* @param {object} json json data return from the server. * @param {object} json json data return from the server.
* @param {object} json.sEcho Tracking flag for DataTables to match requests * @param {string} json.sEcho Tracking flag for DataTables to match requests
* @param {object} json.iTotalRecords Number of records in the data set, not accounting for filtering * @param {int} json.iTotalRecords Number of records in the data set, not accounting for filtering
* @param {object} json.iTotalDisplayRecords Number of records in the data set, accounting for filtering * @param {int} json.iTotalDisplayRecords Number of records in the data set, accounting for filtering
* @param {object} json.aaData The data to display on this page * @param {array} json.aaData The data to display on this page
* @param {object} [json.sColumns] Column ordering (sName, comma separated) * @param {string} [json.sColumns] Column ordering (sName, comma separated)
* @private * @private
*/ */
function _fnAjaxUpdateDraw ( oSettings, json ) function _fnAjaxUpdateDraw ( oSettings, json )
@ -676,8 +676,8 @@ function _fnAjaxUpdateDraw ( oSettings, json )
{ {
_fnClearTable( oSettings ); _fnClearTable( oSettings );
} }
oSettings._iRecordsTotal = json.iTotalRecords; oSettings._iRecordsTotal = parseInt(json.iTotalRecords, 10);
oSettings._iRecordsDisplay = json.iTotalDisplayRecords; oSettings._iRecordsDisplay = parseInt(json.iTotalDisplayRecords, 10);
/* Determine if reordering is required */ /* Determine if reordering is required */
var sOrdering = _fnColumnOrdering(oSettings); var sOrdering = _fnColumnOrdering(oSettings);