Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed: The 'rewind' of the display start point wasn't being calculate…

…d 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.
  • Loading branch information...
commit eacaca1083fe69078a61cfcf894ea7290c8fd2dd 1 parent 6031c3d
@DataTables authored
View
2  media/js/jquery.dataTables.js
@@ -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;
View
44 media/unit_testing/tests_onhold/1_dom/2600.js
@@ -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();
+} );
View
47 media/unit_testing/tests_onhold/4_server-side/2600.js
@@ -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();
+} );
Please sign in to comment.
Something went wrong with that request. Please try again.