diff --git a/.datatables-commit-sync b/.datatables-commit-sync index 102fabed..3023a24c 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -67abd45d6995d914a0f4c6eb06f9ec1c4f8035dd +8f9daac0fedf3de08b191c663e2ccbcccdb6ae44 diff --git a/composer.json b/composer.json index d4b1cb17..ae0b450a 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "datatables/datatables", - "version": "1.10.21-dev", + "version": "1.10.21", "description": "DataTables is a plug-in for the jQuery Javascript library. It is a highly flexible tool, based upon the foundations of progressive enhancement, which will add advanced interaction controls to any HTML table.", "homepage": "http://www.datatables.net/", "author": "SpryMedia", diff --git a/dataTables.jquery.json b/dataTables.jquery.json index 836843da..efd81803 100644 --- a/dataTables.jquery.json +++ b/dataTables.jquery.json @@ -1,6 +1,6 @@ { "name": "DataTables", - "version": "1.10.21-dev", + "version": "1.10.21", "description": "DataTables enhances HTML tables with the ability to sort, filter and page the data in the table very easily. It provides a comprehensive API and set of configuration options, allowing you to consume data from virtually any data source.", "homepage": "http://datatables.net/", "docs": "http://datatables.net/", diff --git a/examples/advanced_init/column_render.html b/examples/advanced_init/column_render.html index 386527e6..4c02f0ed 100644 --- a/examples/advanced_init/column_render.html +++ b/examples/advanced_init/column_render.html @@ -3,7 +3,7 @@ - + DataTables example - Column rendering @@ -11,7 +11,7 @@ - + @@ -52,7 +52,7 @@ $(document).ready(function() { assigning colours based on content rules and any other form of text manipulation you require.

- +
@@ -63,6 +63,16 @@ $(document).ready(function() { + + + + + + + + + + @@ -251,7 +261,7 @@ $(document).ready(function() { - + @@ -307,7 +317,7 @@ $(document).ready(function() { - + @@ -521,16 +531,6 @@ $(document).ready(function() { - - - - - - - - - -
NameSalary
NamePositionOfficeAgeStart dateSalary
Tiger Nixon
Doris Wilder Sales AssistantSydneySidney 23 2010/09/20 $85,600
Michelle House Integration SpecialistSydneySidney 37 2011/06/02 $95,400$112,000
NamePositionOfficeAgeStart dateSalary