From 452ff3d118d666e5cbd8aa66f216879df798167e Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Fri, 22 Jun 2018 16:31:12 +0100 Subject: [PATCH] Merge branch 'master' of github.com:DataTables/DataTablesSrc --- .datatables-commit-sync | 2 +- examples/advanced_init/column_render.html | 22 +-- examples/advanced_init/complex_header.html | 22 +-- examples/advanced_init/defaults.html | 22 +-- .../advanced_init/dom_multiple_elements.html | 22 +-- examples/advanced_init/dom_toolbar.html | 22 +-- examples/advanced_init/dt_events.html | 22 +-- examples/advanced_init/events_live.html | 22 +-- examples/advanced_init/footer_callback.html | 14 +- .../advanced_init/html5-data-attributes.html | 22 +-- examples/advanced_init/language_file.html | 22 +-- examples/advanced_init/length_menu.html | 22 +-- examples/advanced_init/object_dom_read.html | 22 +-- examples/advanced_init/row_callback.html | 22 +-- examples/advanced_init/row_grouping.html | 22 +-- .../advanced_init/sort_direction_control.html | 22 +-- examples/ajax/custom_data_flat.html | 2 +- examples/ajax/custom_data_property.html | 2 +- examples/ajax/deep.html | 2 +- examples/ajax/defer_render.html | 2 +- examples/ajax/null_data_source.html | 2 +- examples/ajax/objects.html | 2 +- examples/ajax/objects_subarrays.html | 2 +- examples/ajax/orthogonal-data.html | 2 +- examples/ajax/simple.html | 2 +- examples/api/add_row.html | 2 +- examples/api/api_in_init.html | 22 +-- examples/api/counter_columns.html | 22 +-- examples/api/form.html | 18 +-- examples/api/highlight.html | 22 +-- examples/api/multi_filter.html | 22 +-- examples/api/multi_filter_select.html | 22 +-- examples/api/regex.html | 22 +-- examples/api/row_details.html | 2 +- examples/api/select_row.html | 22 +-- examples/api/select_single_row.html | 22 +-- examples/api/show_hide.html | 22 +-- examples/basic_init/alt_pagination.html | 22 +-- examples/basic_init/comma-decimal.html | 22 +-- examples/basic_init/complex_header.html | 22 +-- examples/basic_init/dom.html | 22 +-- examples/basic_init/filter_only.html | 22 +-- examples/basic_init/flexible_width.html | 22 +-- examples/basic_init/hidden_columns.html | 22 +-- examples/basic_init/language.html | 22 +-- examples/basic_init/multi_col_sort.html | 2 +- examples/basic_init/multiple_tables.html | 42 +++--- examples/basic_init/scroll_x.html | 2 +- examples/basic_init/scroll_xy.html | 2 +- examples/basic_init/scroll_y.html | 22 +-- examples/basic_init/scroll_y_dynamic.html | 22 +-- examples/basic_init/state_save.html | 22 +-- examples/basic_init/table_sorting.html | 22 +-- examples/basic_init/zero_configuration.html | 22 +-- examples/data_sources/ajax.html | 2 +- examples/data_sources/dom.html | 22 +-- examples/data_sources/server_side.html | 2 +- examples/plug-ins/api.html | 22 +-- examples/plug-ins/dom_sort.html | 18 +-- examples/plug-ins/range_filtering.html | 22 +-- examples/plug-ins/sorting_auto.html | 22 +-- examples/plug-ins/sorting_manual.html | 22 +-- examples/server_side/custom_vars.html | 2 +- examples/server_side/defer_loading.html | 22 +-- examples/server_side/ids.html | 2 +- examples/server_side/jsonp.html | 2 +- examples/server_side/object_data.html | 2 +- examples/server_side/pipeline.html | 2 +- examples/server_side/post.html | 2 +- examples/server_side/row_details.html | 2 +- examples/server_side/select_rows.html | 2 +- examples/server_side/simple.html | 2 +- examples/styling/bootstrap.html | 22 +-- examples/styling/bootstrap4.html | 26 ++-- examples/styling/cell-border.html | 22 +-- examples/styling/compact.html | 22 +-- examples/styling/display.html | 22 +-- examples/styling/foundation.html | 22 +-- examples/styling/hover.html | 22 +-- examples/styling/jqueryUI.html | 22 +-- examples/styling/material.html | 22 +-- examples/styling/no-classes.html | 22 +-- examples/styling/order-column.html | 22 +-- examples/styling/row-border.html | 22 +-- examples/styling/semanticui.html | 30 ++-- examples/styling/stripe.html | 22 +-- examples/styling/uikit.html | 22 +-- media/js/jquery.dataTables.js | 9 +- media/js/jquery.dataTables.min.js | 142 +++++++++--------- media/js/jquery.js | 10 +- 90 files changed, 786 insertions(+), 785 deletions(-) diff --git a/.datatables-commit-sync b/.datatables-commit-sync index f1e113c7..81d03f48 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -da6bbc663ad0af4f49174233792fdcf514236e95 +9cde720c8ae20235e07c5fb1e573a2e29d3cc0f0 diff --git a/examples/advanced_init/column_render.html b/examples/advanced_init/column_render.html index c8c931a1..8d38d6d4 100644 --- a/examples/advanced_init/column_render.html +++ b/examples/advanced_init/column_render.html @@ -52,7 +52,7 @@ $(document).ready(function() { assigning colours based on content rules and any other form of text manipulation you require.

- +
@@ -63,16 +63,6 @@ $(document).ready(function() { - - - - - - - - - - @@ -531,6 +521,16 @@ $(document).ready(function() { + + + + + + + + + +
NameSalary
NamePositionOfficeAgeStart dateSalary
Tiger Nixon$112,000
NamePositionOfficeAgeStart dateSalary