diff --git a/.datatables-commit-sync b/.datatables-commit-sync index 6e79f8cf..806e84f4 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -fd9e3276b1080d08dd032803177c6ea2affc4d5e +2ed5f1a9372a2d57821ae926bbbc4529bbe6513d diff --git a/examples/advanced_init/column_render.html b/examples/advanced_init/column_render.html index fb8bbc22..243dacdc 100644 --- a/examples/advanced_init/column_render.html +++ b/examples/advanced_init/column_render.html @@ -11,7 +11,7 @@ - @@ -563,7 +563,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/advanced_init/complex_header.html b/examples/advanced_init/complex_header.html index 1bcc7d6a..0808f9a7 100644 --- a/examples/advanced_init/complex_header.html +++ b/examples/advanced_init/complex_header.html @@ -11,7 +11,7 @@ - @@ -554,7 +554,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/advanced_init/defaults.html b/examples/advanced_init/defaults.html index f852b816..4a5634d5 100644 --- a/examples/advanced_init/defaults.html +++ b/examples/advanced_init/defaults.html @@ -11,7 +11,7 @@ - @@ -547,7 +547,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/advanced_init/dom_multiple_elements.html b/examples/advanced_init/dom_multiple_elements.html index 3545df53..afd55cc4 100644 --- a/examples/advanced_init/dom_multiple_elements.html +++ b/examples/advanced_init/dom_multiple_elements.html @@ -19,7 +19,7 @@ } - @@ -549,7 +549,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/advanced_init/dom_toolbar.html b/examples/advanced_init/dom_toolbar.html index 54d706b1..7c9f0971 100644 --- a/examples/advanced_init/dom_toolbar.html +++ b/examples/advanced_init/dom_toolbar.html @@ -17,7 +17,7 @@ - @@ -554,7 +554,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/advanced_init/dt_events.html b/examples/advanced_init/dt_events.html index 2cc66e01..18688e7e 100644 --- a/examples/advanced_init/dt_events.html +++ b/examples/advanced_init/dt_events.html @@ -11,7 +11,7 @@ - @@ -560,7 +560,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/advanced_init/events_live.html b/examples/advanced_init/events_live.html index de5abfdd..26f832ab 100644 --- a/examples/advanced_init/events_live.html +++ b/examples/advanced_init/events_live.html @@ -11,7 +11,7 @@ - @@ -546,7 +546,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/advanced_init/footer_callback.html b/examples/advanced_init/footer_callback.html index 2a20df89..5fa07cc3 100644 --- a/examples/advanced_init/footer_callback.html +++ b/examples/advanced_init/footer_callback.html @@ -13,7 +13,7 @@ th { white-space: nowrap; } - @@ -544,7 +544,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/advanced_init/html5-data-attributes.html b/examples/advanced_init/html5-data-attributes.html index 77c13a31..071e3835 100644 --- a/examples/advanced_init/html5-data-attributes.html +++ b/examples/advanced_init/html5-data-attributes.html @@ -11,7 +11,7 @@ - @@ -544,7 +544,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/advanced_init/html5-data-options.html b/examples/advanced_init/html5-data-options.html index a72d0685..f95f74ef 100644 --- a/examples/advanced_init/html5-data-options.html +++ b/examples/advanced_init/html5-data-options.html @@ -11,7 +11,7 @@ - @@ -543,7 +543,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/advanced_init/index.html b/examples/advanced_init/index.html index 403001a9..437801b5 100644 --- a/examples/advanced_init/index.html +++ b/examples/advanced_init/index.html @@ -6,7 +6,7 @@ - diff --git a/examples/advanced_init/language_file.html b/examples/advanced_init/language_file.html index a35305ba..b2e3414e 100644 --- a/examples/advanced_init/language_file.html +++ b/examples/advanced_init/language_file.html @@ -11,7 +11,7 @@ - @@ -543,7 +543,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/advanced_init/length_menu.html b/examples/advanced_init/length_menu.html index b29e3674..21766c9c 100644 --- a/examples/advanced_init/length_menu.html +++ b/examples/advanced_init/length_menu.html @@ -11,7 +11,7 @@ - @@ -543,7 +543,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/advanced_init/object_dom_read.html b/examples/advanced_init/object_dom_read.html index 0b35c3de..e3103a3d 100644 --- a/examples/advanced_init/object_dom_read.html +++ b/examples/advanced_init/object_dom_read.html @@ -11,7 +11,7 @@ - @@ -569,7 +569,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/advanced_init/row_callback.html b/examples/advanced_init/row_callback.html index 3a4f957d..815f2ab6 100644 --- a/examples/advanced_init/row_callback.html +++ b/examples/advanced_init/row_callback.html @@ -16,7 +16,7 @@ } - @@ -553,7 +553,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/advanced_init/row_grouping.html b/examples/advanced_init/row_grouping.html index 6de1acce..a5036501 100644 --- a/examples/advanced_init/row_grouping.html +++ b/examples/advanced_init/row_grouping.html @@ -16,7 +16,7 @@ tr.group:hover { } - @@ -605,7 +605,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/advanced_init/sort_direction_control.html b/examples/advanced_init/sort_direction_control.html index 2f61af46..b3cdb8c3 100644 --- a/examples/advanced_init/sort_direction_control.html +++ b/examples/advanced_init/sort_direction_control.html @@ -11,7 +11,7 @@ - @@ -563,7 +563,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/ajax/custom_data_flat.html b/examples/ajax/custom_data_flat.html index f0fd85a8..1ab01e3d 100644 --- a/examples/ajax/custom_data_flat.html +++ b/examples/ajax/custom_data_flat.html @@ -11,7 +11,7 @@ - @@ -110,7 +110,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/ajax/custom_data_property.html b/examples/ajax/custom_data_property.html index 703fcc0e..f5654894 100644 --- a/examples/ajax/custom_data_property.html +++ b/examples/ajax/custom_data_property.html @@ -11,7 +11,7 @@ - @@ -95,7 +95,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/ajax/deep.html b/examples/ajax/deep.html index eb98fcd9..89e80fb9 100644 --- a/examples/ajax/deep.html +++ b/examples/ajax/deep.html @@ -11,7 +11,7 @@ - @@ -116,7 +116,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/ajax/defer_render.html b/examples/ajax/defer_render.html index 4524906b..3ab6597b 100644 --- a/examples/ajax/defer_render.html +++ b/examples/ajax/defer_render.html @@ -11,7 +11,7 @@ - @@ -85,7 +85,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/ajax/index.html b/examples/ajax/index.html index 2a7c9fa7..dea0343d 100644 --- a/examples/ajax/index.html +++ b/examples/ajax/index.html @@ -6,7 +6,7 @@ - diff --git a/examples/ajax/null_data_source.html b/examples/ajax/null_data_source.html index 18408222..38f6400e 100644 --- a/examples/ajax/null_data_source.html +++ b/examples/ajax/null_data_source.html @@ -11,7 +11,7 @@ - @@ -113,7 +113,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/ajax/objects.html b/examples/ajax/objects.html index 42076e95..f641fbf6 100644 --- a/examples/ajax/objects.html +++ b/examples/ajax/objects.html @@ -11,7 +11,7 @@ - @@ -110,7 +110,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/ajax/objects_subarrays.html b/examples/ajax/objects_subarrays.html index 6c55523a..20d3b4b8 100644 --- a/examples/ajax/objects_subarrays.html +++ b/examples/ajax/objects_subarrays.html @@ -11,7 +11,7 @@ - @@ -124,7 +124,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/ajax/orthogonal-data.html b/examples/ajax/orthogonal-data.html index 80100d40..87cff883 100644 --- a/examples/ajax/orthogonal-data.html +++ b/examples/ajax/orthogonal-data.html @@ -11,7 +11,7 @@ - @@ -118,7 +118,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/ajax/simple.html b/examples/ajax/simple.html index 2b2bd2ba..676fb9e1 100644 --- a/examples/ajax/simple.html +++ b/examples/ajax/simple.html @@ -11,7 +11,7 @@ - @@ -97,7 +97,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/api/add_row.html b/examples/api/add_row.html index 2b051e7d..e9db3a19 100644 --- a/examples/api/add_row.html +++ b/examples/api/add_row.html @@ -11,7 +11,7 @@ - @@ -113,7 +113,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/api/api_in_init.html b/examples/api/api_in_init.html index 4bf34f9d..00a23f26 100644 --- a/examples/api/api_in_init.html +++ b/examples/api/api_in_init.html @@ -11,7 +11,7 @@ - @@ -555,7 +555,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/api/counter_columns.html b/examples/api/counter_columns.html index ff63f4f8..346b04bb 100644 --- a/examples/api/counter_columns.html +++ b/examples/api/counter_columns.html @@ -11,7 +11,7 @@ - @@ -565,7 +565,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/api/form.html b/examples/api/form.html index 8d97438e..70d4a9f0 100644 --- a/examples/api/form.html +++ b/examples/api/form.html @@ -11,7 +11,7 @@ - @@ -1350,7 +1350,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/api/highlight.html b/examples/api/highlight.html index 983d0fbc..2844b6fc 100644 --- a/examples/api/highlight.html +++ b/examples/api/highlight.html @@ -17,7 +17,7 @@ td.highlight { - @@ -559,7 +559,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/api/index.html b/examples/api/index.html index ff7f7497..bc771972 100644 --- a/examples/api/index.html +++ b/examples/api/index.html @@ -6,7 +6,7 @@ - diff --git a/examples/api/multi_filter.html b/examples/api/multi_filter.html index 807d359a..18e9bb71 100644 --- a/examples/api/multi_filter.html +++ b/examples/api/multi_filter.html @@ -17,7 +17,7 @@ } - @@ -587,7 +587,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/api/multi_filter_select.html b/examples/api/multi_filter_select.html index c47157ea..f8be72a2 100644 --- a/examples/api/multi_filter_select.html +++ b/examples/api/multi_filter_select.html @@ -11,7 +11,7 @@ - @@ -592,7 +592,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/api/regex.html b/examples/api/regex.html index 32e98afe..26c5711a 100644 --- a/examples/api/regex.html +++ b/examples/api/regex.html @@ -11,7 +11,7 @@ - @@ -642,7 +642,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/api/row_details.html b/examples/api/row_details.html index 9e01bd81..211a7272 100644 --- a/examples/api/row_details.html +++ b/examples/api/row_details.html @@ -19,7 +19,7 @@ tr.shown td.details-control { } - @@ -188,7 +188,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/api/select_row.html b/examples/api/select_row.html index e4003533..db0aa70a 100644 --- a/examples/api/select_row.html +++ b/examples/api/select_row.html @@ -11,7 +11,7 @@ - @@ -552,7 +552,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/api/select_single_row.html b/examples/api/select_single_row.html index 50908d57..9f9ba4ce 100644 --- a/examples/api/select_single_row.html +++ b/examples/api/select_single_row.html @@ -11,7 +11,7 @@ - @@ -567,7 +567,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/api/show_hide.html b/examples/api/show_hide.html index 5a36877e..bab3f8d6 100644 --- a/examples/api/show_hide.html +++ b/examples/api/show_hide.html @@ -11,7 +11,7 @@ - @@ -569,7 +569,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/api/tabs_and_scrolling.html b/examples/api/tabs_and_scrolling.html index 797f3a01..3313537a 100644 --- a/examples/api/tabs_and_scrolling.html +++ b/examples/api/tabs_and_scrolling.html @@ -12,7 +12,7 @@ - @@ -129,7 +129,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/basic_init/alt_pagination.html b/examples/basic_init/alt_pagination.html index a03ce30b..ea014b21 100644 --- a/examples/basic_init/alt_pagination.html +++ b/examples/basic_init/alt_pagination.html @@ -11,7 +11,7 @@ - @@ -550,7 +550,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/basic_init/comma-decimal.html b/examples/basic_init/comma-decimal.html index e261d7da..d571fa23 100644 --- a/examples/basic_init/comma-decimal.html +++ b/examples/basic_init/comma-decimal.html @@ -11,7 +11,7 @@ - @@ -550,7 +550,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/basic_init/complex_header.html b/examples/basic_init/complex_header.html index 80e6b5ae..491d1b5b 100644 --- a/examples/basic_init/complex_header.html +++ b/examples/basic_init/complex_header.html @@ -11,7 +11,7 @@ - @@ -538,7 +538,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/basic_init/dom.html b/examples/basic_init/dom.html index c3ad6d02..331fab75 100644 --- a/examples/basic_init/dom.html +++ b/examples/basic_init/dom.html @@ -11,7 +11,7 @@ - @@ -92,7 +92,7 @@ $(document).ready(function() {

All options (with the exception of the t (table) option can be specified multiple times, for if you want to show the same control multiple times (pagination at the top and bottom of the table for example).

Furthermore, note that additional dom - options can be added to DataTables through the use of plug-ins.

+ options can be added to DataTables through the use of plug-ins.

In the example below, the table information is moved to the top of the table, and all the interaction elements to the bottom, each wrapper in a container div.

@@ -593,7 +593,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/basic_init/filter_only.html b/examples/basic_init/filter_only.html index 5058b662..e02b7cb3 100644 --- a/examples/basic_init/filter_only.html +++ b/examples/basic_init/filter_only.html @@ -11,7 +11,7 @@ - @@ -539,7 +539,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/basic_init/flexible_width.html b/examples/basic_init/flexible_width.html index 03b23ffb..d8972553 100644 --- a/examples/basic_init/flexible_width.html +++ b/examples/basic_init/flexible_width.html @@ -15,7 +15,7 @@ } - @@ -538,7 +538,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/basic_init/hidden_columns.html b/examples/basic_init/hidden_columns.html index 78eeeceb..e68e4bd0 100644 --- a/examples/basic_init/hidden_columns.html +++ b/examples/basic_init/hidden_columns.html @@ -11,7 +11,7 @@ - @@ -561,7 +561,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/basic_init/index.html b/examples/basic_init/index.html index e9df084d..efbf1539 100644 --- a/examples/basic_init/index.html +++ b/examples/basic_init/index.html @@ -6,7 +6,7 @@ - diff --git a/examples/basic_init/language.html b/examples/basic_init/language.html index 581bdca5..eea18496 100644 --- a/examples/basic_init/language.html +++ b/examples/basic_init/language.html @@ -11,7 +11,7 @@ - @@ -547,7 +547,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/basic_init/multi_col_sort.html b/examples/basic_init/multi_col_sort.html index cf723f03..2ee34f48 100644 --- a/examples/basic_init/multi_col_sort.html +++ b/examples/basic_init/multi_col_sort.html @@ -11,7 +11,7 @@ - @@ -499,7 +499,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/basic_init/multiple_tables.html b/examples/basic_init/multiple_tables.html index 4aad5b5b..2c2e3144 100644 --- a/examples/basic_init/multiple_tables.html +++ b/examples/basic_init/multiple_tables.html @@ -15,7 +15,7 @@ } - @@ -250,7 +250,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/basic_init/scroll_x.html b/examples/basic_init/scroll_x.html index 85edc376..ad650a23 100644 --- a/examples/basic_init/scroll_x.html +++ b/examples/basic_init/scroll_x.html @@ -16,7 +16,7 @@ } - @@ -707,7 +707,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/basic_init/scroll_xy.html b/examples/basic_init/scroll_xy.html index 1a918950..c7c45830 100644 --- a/examples/basic_init/scroll_xy.html +++ b/examples/basic_init/scroll_xy.html @@ -16,7 +16,7 @@ } - @@ -705,7 +705,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/basic_init/scroll_y.html b/examples/basic_init/scroll_y.html index b7e4b11b..b13652e2 100644 --- a/examples/basic_init/scroll_y.html +++ b/examples/basic_init/scroll_y.html @@ -11,7 +11,7 @@ - @@ -546,7 +546,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/basic_init/scroll_y_dynamic.html b/examples/basic_init/scroll_y_dynamic.html index a1cdcf67..e9836a9c 100644 --- a/examples/basic_init/scroll_y_dynamic.html +++ b/examples/basic_init/scroll_y_dynamic.html @@ -11,7 +11,7 @@ - @@ -542,7 +542,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/basic_init/state_save.html b/examples/basic_init/state_save.html index ea62b8e0..7a4d94ae 100644 --- a/examples/basic_init/state_save.html +++ b/examples/basic_init/state_save.html @@ -11,7 +11,7 @@ - @@ -545,7 +545,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/basic_init/table_sorting.html b/examples/basic_init/table_sorting.html index 26cc7121..108755d3 100644 --- a/examples/basic_init/table_sorting.html +++ b/examples/basic_init/table_sorting.html @@ -11,7 +11,7 @@ - @@ -540,7 +540,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/basic_init/zero_configuration.html b/examples/basic_init/zero_configuration.html index a05b2420..448eec1c 100644 --- a/examples/basic_init/zero_configuration.html +++ b/examples/basic_init/zero_configuration.html @@ -11,7 +11,7 @@ - @@ -533,7 +533,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/data_sources/ajax.html b/examples/data_sources/ajax.html index a6aadfcd..2103d378 100644 --- a/examples/data_sources/ajax.html +++ b/examples/data_sources/ajax.html @@ -11,7 +11,7 @@ - @@ -84,7 +84,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/data_sources/dom.html b/examples/data_sources/dom.html index c70f9497..44e2cdd6 100644 --- a/examples/data_sources/dom.html +++ b/examples/data_sources/dom.html @@ -11,7 +11,7 @@ - @@ -534,7 +534,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/data_sources/index.html b/examples/data_sources/index.html index f8696f7e..4577bc9f 100644 --- a/examples/data_sources/index.html +++ b/examples/data_sources/index.html @@ -6,7 +6,7 @@ - diff --git a/examples/data_sources/js_array.html b/examples/data_sources/js_array.html index 248201c9..f8c8013a 100644 --- a/examples/data_sources/js_array.html +++ b/examples/data_sources/js_array.html @@ -11,7 +11,7 @@ - @@ -157,7 +157,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/data_sources/server_side.html b/examples/data_sources/server_side.html index 66ecac7a..620f184c 100644 --- a/examples/data_sources/server_side.html +++ b/examples/data_sources/server_side.html @@ -11,7 +11,7 @@ - @@ -87,7 +87,7 @@ $(document).ready(function() {

In addition to the above code, the following Javascript library files are loaded for use in this example:

diff --git a/examples/index.html b/examples/index.html index 56f781df..c36bf21c 100644 --- a/examples/index.html +++ b/examples/index.html @@ -6,7 +6,7 @@ - @@ -167,7 +167,7 @@ Base style - stripe
  • - Bootstrap + Bootstrap 3
  • Foundation @@ -175,6 +175,15 @@
  • jQuery UI ThemeRoller
    • +
  • + Bootstrap 4 (Tech. preview) +
    • +
  • + Semantic UI (Tech. preview) +
    • +
  • + Material Design (Tech. preview) +
    • diff --git a/examples/plug-ins/api.html b/examples/plug-ins/api.html index 8541a086..2c538951 100644 --- a/examples/plug-ins/api.html +++ b/examples/plug-ins/api.html @@ -11,7 +11,7 @@ - @@ -580,7 +580,7 @@ $(document).ready(function() {

    In addition to the above code, the following Javascript library files are loaded for use in this example:

    diff --git a/examples/plug-ins/dom_sort.html b/examples/plug-ins/dom_sort.html index c2b3eaff..ea0344f8 100644 --- a/examples/plug-ins/dom_sort.html +++ b/examples/plug-ins/dom_sort.html @@ -11,7 +11,7 @@ - @@ -1414,7 +1414,7 @@ $(document).ready(function() {

    In addition to the above code, the following Javascript library files are loaded for use in this example:

    diff --git a/examples/plug-ins/index.html b/examples/plug-ins/index.html index 5263c982..3039bc93 100644 --- a/examples/plug-ins/index.html +++ b/examples/plug-ins/index.html @@ -6,7 +6,7 @@ - diff --git a/examples/plug-ins/range_filtering.html b/examples/plug-ins/range_filtering.html index cb1d755a..11b52ae8 100644 --- a/examples/plug-ins/range_filtering.html +++ b/examples/plug-ins/range_filtering.html @@ -11,7 +11,7 @@ - @@ -590,7 +590,7 @@ $(document).ready(function() {

    In addition to the above code, the following Javascript library files are loaded for use in this example:

    diff --git a/examples/plug-ins/sorting_auto.html b/examples/plug-ins/sorting_auto.html index 944f7a38..4b47054b 100644 --- a/examples/plug-ins/sorting_auto.html +++ b/examples/plug-ins/sorting_auto.html @@ -11,7 +11,7 @@ - @@ -573,7 +573,7 @@ $(document).ready(function() {

    In addition to the above code, the following Javascript library files are loaded for use in this example:

    diff --git a/examples/plug-ins/sorting_manual.html b/examples/plug-ins/sorting_manual.html index 2a99ac5c..7022b0ba 100644 --- a/examples/plug-ins/sorting_manual.html +++ b/examples/plug-ins/sorting_manual.html @@ -11,7 +11,7 @@ - @@ -567,7 +567,7 @@ $(document).ready(function() {

    In addition to the above code, the following Javascript library files are loaded for use in this example:

    diff --git a/examples/resources/syntax/shCore.js b/examples/resources/syntax/shCore.js index 8731a6aa..16a37e8c 100644 --- a/examples/resources/syntax/shCore.js +++ b/examples/resources/syntax/shCore.js @@ -303,10 +303,10 @@ var sh = { */ highlight: function(globalParams, element) { - // Don't run the syntax highlighter on IE6/7 as it absolutely kills + // Don't run the syntax highlighter on IE6/7/8 as it absolutely kills // performance var userAgent = navigator.appVersion; - if (userAgent.indexOf("MSIE 7.") !== -1 || userAgent.indexOf("MSIE 6.") !== -1) { + if (userAgent.indexOf("MSIE 8.") !== -1 || userAgent.indexOf("MSIE 7.") !== -1 || userAgent.indexOf("MSIE 6.") !== -1) { return; } diff --git a/examples/server_side/custom_vars.html b/examples/server_side/custom_vars.html index 1f66b3ca..9e679a7f 100644 --- a/examples/server_side/custom_vars.html +++ b/examples/server_side/custom_vars.html @@ -11,7 +11,7 @@ - @@ -102,7 +102,7 @@ $(document).ready(function() {

    In addition to the above code, the following Javascript library files are loaded for use in this example:

    diff --git a/examples/server_side/defer_loading.html b/examples/server_side/defer_loading.html index cb37ec1b..09325e50 100644 --- a/examples/server_side/defer_loading.html +++ b/examples/server_side/defer_loading.html @@ -11,7 +11,7 @@ - @@ -170,7 +170,7 @@ $(document).ready(function() {

    In addition to the above code, the following Javascript library files are loaded for use in this example:

    diff --git a/examples/server_side/ids.html b/examples/server_side/ids.html index 2f5b99bf..cea4a6cf 100644 --- a/examples/server_side/ids.html +++ b/examples/server_side/ids.html @@ -11,7 +11,7 @@ - @@ -101,7 +101,7 @@ $(document).ready(function() {

    In addition to the above code, the following Javascript library files are loaded for use in this example:

    diff --git a/examples/server_side/index.html b/examples/server_side/index.html index 425b0c3d..e0619ffc 100644 --- a/examples/server_side/index.html +++ b/examples/server_side/index.html @@ -6,7 +6,7 @@ - diff --git a/examples/server_side/jsonp.html b/examples/server_side/jsonp.html index 430ebe29..d7a1a87a 100644 --- a/examples/server_side/jsonp.html +++ b/examples/server_side/jsonp.html @@ -11,7 +11,7 @@ - @@ -94,7 +94,7 @@ $(document).ready(function() {

    In addition to the above code, the following Javascript library files are loaded for use in this example:

    diff --git a/examples/server_side/object_data.html b/examples/server_side/object_data.html index b02008fa..99c61701 100644 --- a/examples/server_side/object_data.html +++ b/examples/server_side/object_data.html @@ -11,7 +11,7 @@ - @@ -100,7 +100,7 @@ $(document).ready(function() {

    In addition to the above code, the following Javascript library files are loaded for use in this example:

    diff --git a/examples/server_side/pipeline.html b/examples/server_side/pipeline.html index 504e8fed..06875409 100644 --- a/examples/server_side/pipeline.html +++ b/examples/server_side/pipeline.html @@ -11,7 +11,7 @@ - @@ -331,7 +331,7 @@ $(document).ready(function() {

    In addition to the above code, the following Javascript library files are loaded for use in this example:

    diff --git a/examples/server_side/post.html b/examples/server_side/post.html index 928b6d96..2ea9cd80 100644 --- a/examples/server_side/post.html +++ b/examples/server_side/post.html @@ -11,7 +11,7 @@ - @@ -110,7 +110,7 @@ $(document).ready(function() {

    In addition to the above code, the following Javascript library files are loaded for use in this example:

    diff --git a/examples/server_side/row_details.html b/examples/server_side/row_details.html index 2123beba..5b3e60f9 100644 --- a/examples/server_side/row_details.html +++ b/examples/server_side/row_details.html @@ -19,7 +19,7 @@ tr.details td.details-control { } - @@ -204,7 +204,7 @@ $(document).ready(function() {

    In addition to the above code, the following Javascript library files are loaded for use in this example:

    diff --git a/examples/server_side/scripts/ssp.class.php b/examples/server_side/scripts/ssp.class.php index ecd90074..060d9d76 100644 --- a/examples/server_side/scripts/ssp.class.php +++ b/examples/server_side/scripts/ssp.class.php @@ -436,7 +436,7 @@ class SSP { } // Return all - return $stmt->fetchAll(); + return $stmt->fetchAll( PDO::FETCH_BOTH ); } diff --git a/examples/server_side/select_rows.html b/examples/server_side/select_rows.html index ef0fea7e..ba47843b 100644 --- a/examples/server_side/select_rows.html +++ b/examples/server_side/select_rows.html @@ -11,7 +11,7 @@ - @@ -127,7 +127,7 @@ $(document).ready(function() {

    In addition to the above code, the following Javascript library files are loaded for use in this example:

    diff --git a/examples/server_side/simple.html b/examples/server_side/simple.html index 1bae02b8..5ab971f8 100644 --- a/examples/server_side/simple.html +++ b/examples/server_side/simple.html @@ -11,7 +11,7 @@ - @@ -86,7 +86,7 @@ $(document).ready(function() {

    In addition to the above code, the following Javascript library files are loaded for use in this example:

    diff --git a/examples/styling/bootstrap.html b/examples/styling/bootstrap.html index a67448d0..7f768d64 100644 --- a/examples/styling/bootstrap.html +++ b/examples/styling/bootstrap.html @@ -4,7 +4,7 @@ - DataTables example - Bootstrap + DataTables example - Bootstrap 3 @@ -12,7 +12,7 @@ - @@ -33,10 +33,10 @@ $(document).ready(function() {
    -

    DataTables example Bootstrap

    +

    DataTables example Bootstrap 3

    -

    DataTables can integrate seamlessly with Bootstrap using Bootstrap's table - styling options to present a consistent interface with your Bootstrap driven site / app.

    +

    DataTables can integrate seamlessly with Bootstrap 3 using Bootstrap's table styling options to present an interface with a uniform design, based on Bootstrap, for your site / app.

    DataTables' Bootstrap integration also provides a renderer for the pagination control in DataTables to ensure that the pagination of the table is also styled consistently by Bootstrap.

    This integration is done simply by including the DataTables Bootstrap files (CSS and JS) which will set the defaults needed for DataTables to be initialised as @@ -537,7 +537,7 @@ $(document).ready(function() {

    In addition to the above code, the following Javascript library files are loaded for use in this example:

    diff --git a/examples/styling/cell-border.html b/examples/styling/cell-border.html index 79a40d0b..5aa21c1a 100644 --- a/examples/styling/cell-border.html +++ b/examples/styling/cell-border.html @@ -11,7 +11,7 @@ - @@ -529,7 +529,7 @@ $(document).ready(function() {

    In addition to the above code, the following Javascript library files are loaded for use in this example:

    diff --git a/examples/styling/compact.html b/examples/styling/compact.html index 0f7940cc..40a7c1d9 100644 --- a/examples/styling/compact.html +++ b/examples/styling/compact.html @@ -11,7 +11,7 @@ - @@ -530,7 +530,7 @@ $(document).ready(function() {

    In addition to the above code, the following Javascript library files are loaded for use in this example:

    diff --git a/examples/styling/display.html b/examples/styling/display.html index 963dd35d..dcdd4a70 100644 --- a/examples/styling/display.html +++ b/examples/styling/display.html @@ -11,7 +11,7 @@ - @@ -541,7 +541,7 @@ $(document).ready(function() {

    In addition to the above code, the following Javascript library files are loaded for use in this example:

    diff --git a/examples/styling/foundation.html b/examples/styling/foundation.html index 18bd8555..ea304a4c 100644 --- a/examples/styling/foundation.html +++ b/examples/styling/foundation.html @@ -12,7 +12,7 @@ - @@ -537,7 +537,7 @@ $(document).ready(function() {

    In addition to the above code, the following Javascript library files are loaded for use in this example:

    diff --git a/examples/styling/hover.html b/examples/styling/hover.html index 836c4f35..4832e608 100644 --- a/examples/styling/hover.html +++ b/examples/styling/hover.html @@ -11,7 +11,7 @@ - @@ -530,7 +530,7 @@ $(document).ready(function() {

    In addition to the above code, the following Javascript library files are loaded for use in this example:

    diff --git a/examples/styling/index.html b/examples/styling/index.html index 36c16024..4942b4fe 100644 --- a/examples/styling/index.html +++ b/examples/styling/index.html @@ -6,7 +6,7 @@ - @@ -60,7 +60,7 @@ Base style - stripe
  • - Bootstrap + Bootstrap 3
  • Foundation @@ -68,6 +68,15 @@
  • jQuery UI ThemeRoller
    • +
  • + Bootstrap 4 (Tech. preview) +
    • +
  • + Semantic UI (Tech. preview) +
    • +
  • + Material Design (Tech. preview) +
    • diff --git a/examples/styling/jqueryUI.html b/examples/styling/jqueryUI.html index 9d0a45ee..65296cbb 100644 --- a/examples/styling/jqueryUI.html +++ b/examples/styling/jqueryUI.html @@ -12,7 +12,7 @@ - @@ -540,7 +540,7 @@ $(document).ready(function() {

    In addition to the above code, the following Javascript library files are loaded for use in this example:

    diff --git a/examples/styling/no-classes.html b/examples/styling/no-classes.html index a0dc9e5f..201b0e77 100644 --- a/examples/styling/no-classes.html +++ b/examples/styling/no-classes.html @@ -11,7 +11,7 @@ - @@ -529,7 +529,7 @@ $(document).ready(function() {

    In addition to the above code, the following Javascript library files are loaded for use in this example:

    diff --git a/examples/styling/order-column.html b/examples/styling/order-column.html index 1cc32fd6..26484f4c 100644 --- a/examples/styling/order-column.html +++ b/examples/styling/order-column.html @@ -11,7 +11,7 @@ - @@ -530,7 +530,7 @@ $(document).ready(function() {

    In addition to the above code, the following Javascript library files are loaded for use in this example:

    diff --git a/examples/styling/row-border.html b/examples/styling/row-border.html index 85d48d48..ff64e705 100644 --- a/examples/styling/row-border.html +++ b/examples/styling/row-border.html @@ -11,7 +11,7 @@ - @@ -529,7 +529,7 @@ $(document).ready(function() {

    In addition to the above code, the following Javascript library files are loaded for use in this example:

    diff --git a/examples/styling/stripe.html b/examples/styling/stripe.html index 2168fbe9..a6e31fe3 100644 --- a/examples/styling/stripe.html +++ b/examples/styling/stripe.html @@ -11,7 +11,7 @@ - @@ -529,7 +529,7 @@ $(document).ready(function() {

    In addition to the above code, the following Javascript library files are loaded for use in this example:

    diff --git a/media/js/dataTables.bootstrap.js b/media/js/dataTables.bootstrap.js index 83f27866..417aec3d 100644 --- a/media/js/dataTables.bootstrap.js +++ b/media/js/dataTables.bootstrap.js @@ -178,43 +178,5 @@ DataTable.ext.renderer.pageButton.bootstrap = function ( settings, host, idx, bu }; -/* - * TableTools Bootstrap compatibility - * Required TableTools 2.1+ - */ -if ( DataTable.TableTools ) { - // Set the classes that TableTools uses to something suitable for Bootstrap - $.extend( true, DataTable.TableTools.classes, { - "container": "DTTT btn-group", - "buttons": { - "normal": "btn btn-default", - "disabled": "disabled" - }, - "collection": { - "container": "DTTT_dropdown dropdown-menu", - "buttons": { - "normal": "", - "disabled": "disabled" - } - }, - "print": { - "info": "DTTT_print_info" - }, - "select": { - "row": "active" - } - } ); - - // Have the collection use a bootstrap compatible drop down - $.extend( true, DataTable.TableTools.DEFAULTS.oTags, { - "collection": { - "container": "ul", - "button": "li", - "liner": "a" - } - } ); -} - - return DataTable; })); \ No newline at end of file diff --git a/media/js/dataTables.bootstrap.min.js b/media/js/dataTables.bootstrap.min.js index 7ae847b0..2d824c8f 100644 --- a/media/js/dataTables.bootstrap.min.js +++ b/media/js/dataTables.bootstrap.min.js @@ -2,8 +2,7 @@ DataTables Bootstrap 3 integration ©2011-2015 SpryMedia Ltd - datatables.net/license */ -(function(b){"function"===typeof define&&define.amd?define(["jquery","datatables.net"],function(a){return b(a,window,document)}):"object"===typeof exports?module.exports=function(a,e){a||(a=window);if(!e||!e.fn.dataTable)e=require("datatables.net")(a,e).$;return b(e,a,a.document)}:b(jQuery,window,document)})(function(b,a,e){var d=b.fn.dataTable;b.extend(!0,d.defaults,{dom:"<'row'<'col-sm-6'l><'col-sm-6'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-5'i><'col-sm-7'p>>",renderer:"bootstrap"});b.extend(d.ext.classes, -{sWrapper:"dataTables_wrapper form-inline dt-bootstrap",sFilterInput:"form-control input-sm",sLengthSelect:"form-control input-sm",sProcessing:"dataTables_processing panel panel-default"});d.ext.renderer.pageButton.bootstrap=function(a,h,r,m,j,n){var o=new d.Api(a),s=a.oClasses,k=a.oLanguage.oPaginate,t=a.oLanguage.oAria.paginate||{},f,g,p=0,q=function(d,e){var l,h,i,c,m=function(a){a.preventDefault();!b(a.currentTarget).hasClass("disabled")&&o.page()!=a.data.action&&o.page(a.data.action).draw("page")}; -l=0;for(h=e.length;l",{"class":s.sPageButton+" "+g,id:0===r&&"string"===typeof c?a.sTableId+"_"+c:null}).append(b("",{href:"#", -"aria-controls":a.sTableId,"aria-label":t[c],"data-dt-idx":p,tabindex:a.iTabIndex}).html(f)).appendTo(d),a.oApi._fnBindAction(i,{action:c},m),p++)}},i;try{i=b(h).find(e.activeElement).data("dt-idx")}catch(u){}q(b(h).empty().html('