mirror of
https://github.com/DataTables/DataTables.git
synced 2025-02-20 18:54:15 +01:00
Fixed: The 'rewind' of the display start point wasn't being calculated in the same way for server-side processing and client-side. This was due to a bug in the calculation of fnDisplayEnd for server-side - 2600.
This commit is contained in:
parent
6031c3d0bb
commit
eacaca1083
2
media/js/jquery.dataTables.js
vendored
2
media/js/jquery.dataTables.js
vendored
@ -878,7 +878,7 @@
|
||||
return this._iDisplayStart+this.aiDisplay.length;
|
||||
} else {
|
||||
return Math.min( this._iDisplayStart+this._iDisplayLength,
|
||||
this._iDisplayStart+this.aiDisplay.length );
|
||||
this._iRecordsDisplay );
|
||||
}
|
||||
} else {
|
||||
return this._iDisplayEnd;
|
||||
|
44
media/unit_testing/tests_onhold/1_dom/2600.js
Executable file
44
media/unit_testing/tests_onhold/1_dom/2600.js
Executable file
@ -0,0 +1,44 @@
|
||||
// DATA_TEMPLATE: dom_data
|
||||
oTest.fnStart( "2600 - Display rewind when changing length" );
|
||||
|
||||
$(document).ready( function () {
|
||||
$('#example').dataTable();
|
||||
|
||||
oTest.fnTest(
|
||||
"Info correct on init",
|
||||
null,
|
||||
function () { return $('#example_info').html() == "Showing 1 to 10 of 57 entries"; }
|
||||
);
|
||||
|
||||
oTest.fnTest(
|
||||
"Page 2",
|
||||
function () { $('#example_next').click(); },
|
||||
function () { return $('#example_info').html() == "Showing 11 to 20 of 57 entries"; }
|
||||
);
|
||||
|
||||
oTest.fnTest(
|
||||
"Page 3",
|
||||
function () { $('#example_next').click(); },
|
||||
function () { return $('#example_info').html() == "Showing 21 to 30 of 57 entries"; }
|
||||
);
|
||||
|
||||
oTest.fnTest(
|
||||
"Page 4",
|
||||
function () { $('#example_next').click(); },
|
||||
function () { return $('#example_info').html() == "Showing 31 to 40 of 57 entries"; }
|
||||
);
|
||||
|
||||
oTest.fnTest(
|
||||
"Page 5",
|
||||
function () { $('#example_next').click(); },
|
||||
function () { return $('#example_info').html() == "Showing 41 to 50 of 57 entries"; }
|
||||
);
|
||||
|
||||
oTest.fnTest(
|
||||
"Rewind",
|
||||
function () { $('#example_length select').val('100'); $('#example_length select').change(); },
|
||||
function () { return $('#example_info').html() == "Showing 1 to 57 of 57 entries"; }
|
||||
);
|
||||
|
||||
oTest.fnComplete();
|
||||
} );
|
47
media/unit_testing/tests_onhold/4_server-side/2600.js
Executable file
47
media/unit_testing/tests_onhold/4_server-side/2600.js
Executable file
@ -0,0 +1,47 @@
|
||||
// DATA_TEMPLATE: empty_table
|
||||
oTest.fnStart( "2600 - Display rewind when changing length" );
|
||||
|
||||
$(document).ready( function () {
|
||||
$('#example').dataTable( {
|
||||
"bServerSide": true,
|
||||
"sAjaxSource": "../../../examples/examples_support/server_processing.php"
|
||||
} );
|
||||
|
||||
oTest.fnWaitTest(
|
||||
"Info correct on init",
|
||||
null,
|
||||
function () { return $('#example_info').html() == "Showing 1 to 10 of 57 entries"; }
|
||||
);
|
||||
|
||||
oTest.fnWaitTest(
|
||||
"Page 2",
|
||||
function () { $('#example_next').click(); },
|
||||
function () { return $('#example_info').html() == "Showing 11 to 20 of 57 entries"; }
|
||||
);
|
||||
|
||||
oTest.fnWaitTest(
|
||||
"Page 3",
|
||||
function () { $('#example_next').click(); },
|
||||
function () { return $('#example_info').html() == "Showing 21 to 30 of 57 entries"; }
|
||||
);
|
||||
|
||||
oTest.fnWaitTest(
|
||||
"Page 4",
|
||||
function () { $('#example_next').click(); },
|
||||
function () { return $('#example_info').html() == "Showing 31 to 40 of 57 entries"; }
|
||||
);
|
||||
|
||||
oTest.fnWaitTest(
|
||||
"Page 5",
|
||||
function () { $('#example_next').click(); },
|
||||
function () { return $('#example_info').html() == "Showing 41 to 50 of 57 entries"; }
|
||||
);
|
||||
|
||||
oTest.fnWaitTest(
|
||||
"Rewind",
|
||||
function () { $('#example_length select').val('100'); $('#example_length select').change(); },
|
||||
function () { return $('#example_info').html() == "Showing 1 to 57 of 57 entries"; }
|
||||
);
|
||||
|
||||
oTest.fnComplete();
|
||||
} );
|
Loading…
x
Reference in New Issue
Block a user