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 pull request #106 from timtucker/patch-19

Browse Source 
Dev: Simplify language handling of start number for infinite scrolling
This commit is contained in:
Allan Jardine 2012-10-07 04:12:23 -07:00
commit be6fc4185d
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
media/src/core/core.info.js
View File

@ -1,4 +1,3 @@
/**
* Generate the node required for the info display
* @param {object} oSettings dataTables settings object
@ -85,8 +84,10 @@ function _fnUpdateInfo ( oSettings )
function _fnInfoMacros ( oSettings, str )
{
// When infinite scrolling, we are always starting at 1. _iDisplayStart is used only
// internally
var
iStart = oSettings._iDisplayStart+1,
iStart = oSettings.oScroll.bInfinite ? 1 : oSettings._iDisplayStart+1,
sStart = oSettings.fnFormatNumber( iStart ),
iEnd = oSettings.fnDisplayEnd(),
sEnd = oSettings.fnFormatNumber( iEnd ),
@ -95,13 +96,6 @@ function _fnInfoMacros ( oSettings, str )
iMax = oSettings.fnRecordsTotal(),
sMax = oSettings.fnFormatNumber( iMax );
// When infinite scrolling, we are always starting at 1. _iDisplayStart is used only
// internally
if ( oSettings.oScroll.bInfinite )
{
sStart = oSettings.fnFormatNumber( 1 );
}
return str.
replace(/_START_/g, sStart).
replace(/_END_/g, sEnd).