mirror of
https://github.com/DataTables/DataTables.git
synced 2025-01-18 11:52:11 +01:00
Fixed: When infinte scrolling, the display start count should always be at 1, rather
than reflecting the paging that DataTables is using internally.
This commit is contained in:
parent
af9293cbfc
commit
8b4769f809
8
media/js/jquery.dataTables.js
vendored
8
media/js/jquery.dataTables.js
vendored
@ -4756,6 +4756,14 @@
|
||||
sMax = oSettings.fnFormatNumber( iMax ), sTotal = oSettings.fnFormatNumber( iTotal ),
|
||||
sOut;
|
||||
|
||||
/* When infinite scrolling, we are always starting at 1. _iDisplayStart is used only
|
||||
* internally
|
||||
*/
|
||||
if ( oSettings.oScroll.bInfinite )
|
||||
{
|
||||
sStart = oSettings.fnFormatNumber( 1 );
|
||||
}
|
||||
|
||||
if ( oSettings.fnRecordsDisplay() === 0 &&
|
||||
oSettings.fnRecordsDisplay() == oSettings.fnRecordsTotal() )
|
||||
{
|
||||
|
@ -14,30 +14,60 @@ $(document).ready( function () {
|
||||
function () { return $('#example tbody tr').length == 10; }
|
||||
);
|
||||
|
||||
oTest.fnTest(
|
||||
"Info",
|
||||
null,
|
||||
function () { return $('#example_info').html() == "Showing 1 to 10 of 57 entries"; }
|
||||
);
|
||||
|
||||
oTest.fnTest(
|
||||
"Scroll on 20px adds 10 rows",
|
||||
function () { $('div.dataTables_scrollBody').scrollTop(20); },
|
||||
function () { return $('#example tbody tr').length == 20; }
|
||||
);
|
||||
|
||||
oTest.fnTest(
|
||||
"Info after 20px scroll",
|
||||
null,
|
||||
function () { return $('#example_info').html() == "Showing 1 to 20 of 57 entries"; }
|
||||
);
|
||||
|
||||
oTest.fnTest(
|
||||
"Scroll on 10px more results in the same number of rows",
|
||||
function () { $('div.dataTables_scrollBody').scrollTop(30); },
|
||||
function () { return $('#example tbody tr').length == 20; }
|
||||
);
|
||||
|
||||
oTest.fnTest(
|
||||
"Info after 10 more px scroll",
|
||||
null,
|
||||
function () { return $('#example_info').html() == "Showing 1 to 20 of 57 entries"; }
|
||||
);
|
||||
|
||||
oTest.fnTest(
|
||||
"Scroll to 240px adds another 10 rows",
|
||||
function () { $('div.dataTables_scrollBody').scrollTop(240); },
|
||||
function () { return $('#example tbody tr').length == 30; }
|
||||
);
|
||||
|
||||
oTest.fnTest(
|
||||
"Info after 240px scroll",
|
||||
null,
|
||||
function () { return $('#example_info').html() == "Showing 1 to 30 of 57 entries"; }
|
||||
);
|
||||
|
||||
oTest.fnTest(
|
||||
"Filtering will drop back to 10 rows",
|
||||
function () { oTable.fnFilter('gec') },
|
||||
function () { return $('#example tbody tr').length == 10; }
|
||||
);
|
||||
|
||||
oTest.fnTest(
|
||||
"Info after filtering",
|
||||
null,
|
||||
function () { return $('#example_info').html() == "Showing 1 to 10 of 20 entries (filtered from 57 total entries)"; }
|
||||
);
|
||||
|
||||
oTest.fnTest(
|
||||
"Scroll after filtering adds 10",
|
||||
function () { $('div.dataTables_scrollBody').scrollTop(20); },
|
||||
|
Loading…
x
Reference in New Issue
Block a user