diff --git a/.datatables-commit-sync b/.datatables-commit-sync index 419ef4c1..a43a0048 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -ee44561b3bca8f59db3c98b4045bfb5f258b258d +4e496cbed35f8ee88b0122e90edfbb92b656d3b1 diff --git a/examples/advanced_init/row_grouping.html b/examples/advanced_init/row_grouping.html index dfd92a94..7f1de55f 100644 --- a/examples/advanced_init/row_grouping.html +++ b/examples/advanced_init/row_grouping.html @@ -24,18 +24,19 @@ tr.group:hover { $(document).ready(function() { + var groupColumn = 2; var table = $('#example').DataTable({ "columnDefs": [ - { "visible": false, "targets": 2 } + { "visible": false, "targets": groupColumn } ], - "order": [[ 2, 'asc' ]], + "order": [[ groupColumn, 'asc' ]], "displayLength": 25, "drawCallback": function ( settings ) { var api = this.api(); var rows = api.rows( {page:'current'} ).nodes(); var last=null; - api.column(2, {page:'current'} ).data().each( function ( group, i ) { + api.column(groupColumn, {page:'current'} ).data().each( function ( group, i ) { if ( last !== group ) { $(rows).eq( i ).before( ''+group+'' @@ -50,11 +51,11 @@ $(document).ready(function() { // Order by the grouping $('#example tbody').on( 'click', 'tr.group', function () { var currentOrder = table.order()[0]; - if ( currentOrder[0] === 2 && currentOrder[1] === 'asc' ) { - table.order( [ 2, 'desc' ] ).draw(); + if ( currentOrder[0] === groupColumn && currentOrder[1] === 'asc' ) { + table.order( [ groupColumn, 'desc' ] ).draw(); } else { - table.order( [ 2, 'asc' ] ).draw(); + table.order( [ groupColumn, 'asc' ] ).draw(); } } ); } ); @@ -570,18 +571,19 @@ $(document).ready(function() {

The Javascript shown below is used to initialise the table shown in this example:

$(document).ready(function() { + var groupColumn = 2; var table = $('#example').DataTable({ "columnDefs": [ - { "visible": false, "targets": 2 } + { "visible": false, "targets": groupColumn } ], - "order": [[ 2, 'asc' ]], + "order": [[ groupColumn, 'asc' ]], "displayLength": 25, "drawCallback": function ( settings ) { var api = this.api(); var rows = api.rows( {page:'current'} ).nodes(); var last=null; - api.column(2, {page:'current'} ).data().each( function ( group, i ) { + api.column(groupColumn, {page:'current'} ).data().each( function ( group, i ) { if ( last !== group ) { $(rows).eq( i ).before( '<tr class="group"><td colspan="5">'+group+'</td></tr>' @@ -596,11 +598,11 @@ $(document).ready(function() { // Order by the grouping $('#example tbody').on( 'click', 'tr.group', function () { var currentOrder = table.order()[0]; - if ( currentOrder[0] === 2 && currentOrder[1] === 'asc' ) { - table.order( [ 2, 'desc' ] ).draw(); + if ( currentOrder[0] === groupColumn && currentOrder[1] === 'asc' ) { + table.order( [ groupColumn, 'desc' ] ).draw(); } else { - table.order( [ 2, 'asc' ] ).draw(); + table.order( [ groupColumn, 'asc' ] ).draw(); } } ); } ); diff --git a/examples/server_side/defer_loading.html b/examples/server_side/defer_loading.html index 4dbbb9a8..92514801 100644 --- a/examples/server_side/defer_loading.html +++ b/examples/server_side/defer_loading.html @@ -42,7 +42,7 @@ $(document).ready(function() { to be displayed correctly).

In the example below, the HTML page already has the first 10 rows of data available it in, so we use deferLoading to tell DataTables that this - data is available and that it should wait for user interaction (ordering, paging etc) before making an Ajax call.

+ data is available and that it should wait for under interaction (ordering, paging etc) before making an Ajax call.