diff --git a/.datatables-commit-sync b/.datatables-commit-sync index 93d205f3..dcb8b36b 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -649cb102e0ad7e006bb9287c4d4244b20ff20a41 +e2e28f03d36c2fe92e3eb0d031b3742eabca5bc0 diff --git a/examples/server_side/pipeline.html b/examples/server_side/pipeline.html index f3c635f8..8ece8ed0 100644 --- a/examples/server_side/pipeline.html +++ b/examples/server_side/pipeline.html @@ -95,7 +95,7 @@ $.fn.dataTable.pipeline = function ( opts ) { $.extend( request, conf.data ); } - settings.jqXHR = $.ajax( { + return $.ajax( { "type": conf.method, "url": conf.url, "data": request, @@ -276,7 +276,7 @@ $.fn.dataTable.pipeline = function ( opts ) { $.extend( request, conf.data ); } - settings.jqXHR = $.ajax( { + return $.ajax( { "type": conf.method, "url": conf.url, "data": request, diff --git a/examples/styling/material.html b/examples/styling/material.html index 10cf2b7a..28688432 100644 --- a/examples/styling/material.html +++ b/examples/styling/material.html @@ -5,7 +5,7 @@ DataTables example - Material Design (Tech. preview) - + @@ -21,10 +21,11 @@ $(document).ready(function() { $('#example').DataTable( { + autoWidth: false, columnDefs: [ { - targets: [ 0, 1, 2 ], - className: 'mdl-data-table__cell--non-numeric' + targets: ['_all'], + className: 'mdc-data-table__cell' } ] } ); @@ -535,10 +536,11 @@ $(document).ready(function() {

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

$(document).ready(function() { $('#example').DataTable( { + autoWidth: false, columnDefs: [ { - targets: [ 0, 1, 2 ], - className: 'mdl-data-table__cell--non-numeric' + targets: ['_all'], + className: 'mdc-data-table__cell' } ] } ); @@ -568,7 +570,7 @@ $(document).ready(function() {