From 1ab67a880f7aeef9a26d71798e816fb617a78424 Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Fri, 3 Jan 2014 09:56:57 +0000 Subject: [PATCH] Fix: When in server-side processing mode, the processing display was being removed too early on click to sort column. - Fixed DataTables/DataTables 259 --- .datatables-commit-sync | 2 +- examples/advanced_init/column_render.html | 2 +- examples/advanced_init/complex_header.html | 2 +- examples/advanced_init/defaults.html | 2 +- examples/advanced_init/dom_multiple_elements.html | 2 +- examples/advanced_init/dom_toolbar.html | 2 +- examples/advanced_init/dt_events.html | 2 +- examples/advanced_init/events_live.html | 2 +- examples/advanced_init/footer_callback.html | 2 +- examples/advanced_init/html5-data-attributes.html | 2 +- examples/advanced_init/index.html | 2 +- examples/advanced_init/language_file.html | 2 +- examples/advanced_init/length_menu.html | 2 +- examples/advanced_init/row_callback.html | 2 +- examples/advanced_init/row_grouping.html | 2 +- examples/advanced_init/sort_direction_control.html | 2 +- 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/index.html | 2 +- examples/ajax/null_data_source.html | 2 +- examples/ajax/objects.html | 2 +- examples/ajax/objects_subarrays.html | 2 +- examples/ajax/simple.html | 2 +- examples/api/add_row.html | 2 +- examples/api/api_in_init.html | 2 +- examples/api/counter_columns.html | 2 +- examples/api/form.html | 2 +- examples/api/highlight.html | 2 +- examples/api/index.html | 2 +- examples/api/multi_filter.html | 2 +- examples/api/multi_filter_select.html | 2 +- examples/api/regex.html | 2 +- examples/api/row_details.html | 2 +- examples/api/select_row.html | 2 +- examples/api/select_single_row.html | 2 +- examples/api/show_hide.html | 2 +- examples/api/tabs_and_scrolling.html | 2 +- examples/basic_init/alt_pagination.html | 2 +- examples/basic_init/complex_header.html | 2 +- examples/basic_init/dom.html | 2 +- examples/basic_init/filter_only.html | 2 +- examples/basic_init/flexible_width.html | 2 +- examples/basic_init/hidden_columns.html | 2 +- examples/basic_init/index.html | 2 +- examples/basic_init/language.html | 2 +- examples/basic_init/multi_col_sort.html | 2 +- examples/basic_init/multiple_tables.html | 2 +- examples/basic_init/scroll_x.html | 2 +- examples/basic_init/scroll_xy.html | 2 +- examples/basic_init/scroll_y.html | 2 +- examples/basic_init/scroll_y_theme.html | 2 +- examples/basic_init/state_save.html | 2 +- examples/basic_init/table_sorting.html | 2 +- examples/basic_init/zero_configuration.html | 2 +- examples/data_sources/ajax.html | 2 +- examples/data_sources/dom.html | 2 +- examples/data_sources/index.html | 2 +- examples/data_sources/js_array.html | 2 +- examples/data_sources/server_side.html | 2 +- examples/plug-ins/api.html | 2 +- examples/plug-ins/dom_sort.html | 2 +- examples/plug-ins/index.html | 2 +- examples/plug-ins/range_filtering.html | 2 +- examples/plug-ins/sorting_auto.html | 2 +- examples/plug-ins/sorting_manual.html | 2 +- examples/server_side/custom_vars.html | 2 +- examples/server_side/defer_loading.html | 2 +- examples/server_side/ids.html | 2 +- examples/server_side/index.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 | 2 +- examples/styling/cell-border.html | 2 +- examples/styling/display.html | 2 +- examples/styling/foundation.html | 2 +- examples/styling/hover.html | 2 +- examples/styling/index.html | 2 +- examples/styling/jqueryUI.html | 2 +- examples/styling/no-classes.html | 2 +- examples/styling/order-column.html | 2 +- examples/styling/row-border.html | 2 +- examples/styling/stripe.html | 2 +- media/js/jquery.dataTables.js | 7 ++++++- 90 files changed, 95 insertions(+), 90 deletions(-) diff --git a/.datatables-commit-sync b/.datatables-commit-sync index b37b9df7..08135c1b 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -7e596c7af207083414e0e88b1199d46f75a102bb +2baec538cb6391e8e14a53c0d194b4b396e5600e diff --git a/examples/advanced_init/column_render.html b/examples/advanced_init/column_render.html index 8d6f3d15..c6b0a407 100644 --- a/examples/advanced_init/column_render.html +++ b/examples/advanced_init/column_render.html @@ -759,7 +759,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/advanced_init/complex_header.html b/examples/advanced_init/complex_header.html index cf3e765e..3aa58e47 100644 --- a/examples/advanced_init/complex_header.html +++ b/examples/advanced_init/complex_header.html @@ -754,7 +754,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/advanced_init/defaults.html b/examples/advanced_init/defaults.html index 283673bc..20120ec7 100644 --- a/examples/advanced_init/defaults.html +++ b/examples/advanced_init/defaults.html @@ -744,7 +744,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/advanced_init/dom_multiple_elements.html b/examples/advanced_init/dom_multiple_elements.html index 47ad2469..a3735cf8 100644 --- a/examples/advanced_init/dom_multiple_elements.html +++ b/examples/advanced_init/dom_multiple_elements.html @@ -752,7 +752,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/advanced_init/dom_toolbar.html b/examples/advanced_init/dom_toolbar.html index 8e0ec7ea..19645ba4 100644 --- a/examples/advanced_init/dom_toolbar.html +++ b/examples/advanced_init/dom_toolbar.html @@ -755,7 +755,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/advanced_init/dt_events.html b/examples/advanced_init/dt_events.html index 11f47405..1a9d9215 100644 --- a/examples/advanced_init/dt_events.html +++ b/examples/advanced_init/dt_events.html @@ -760,7 +760,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/advanced_init/events_live.html b/examples/advanced_init/events_live.html index 6a564bd2..74f99b3b 100644 --- a/examples/advanced_init/events_live.html +++ b/examples/advanced_init/events_live.html @@ -739,7 +739,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/advanced_init/footer_callback.html b/examples/advanced_init/footer_callback.html index cd1a1f95..25c45bfd 100644 --- a/examples/advanced_init/footer_callback.html +++ b/examples/advanced_init/footer_callback.html @@ -739,7 +739,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/advanced_init/html5-data-attributes.html b/examples/advanced_init/html5-data-attributes.html index d510ce6a..c0aa200a 100644 --- a/examples/advanced_init/html5-data-attributes.html +++ b/examples/advanced_init/html5-data-attributes.html @@ -746,7 +746,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/advanced_init/index.html b/examples/advanced_init/index.html index f6e073af..3b93cdec 100644 --- a/examples/advanced_init/index.html +++ b/examples/advanced_init/index.html @@ -63,7 +63,7 @@ DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/advanced_init/language_file.html b/examples/advanced_init/language_file.html index 112a0f77..458d0b3d 100644 --- a/examples/advanced_init/language_file.html +++ b/examples/advanced_init/language_file.html @@ -738,7 +738,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/advanced_init/length_menu.html b/examples/advanced_init/length_menu.html index b4df90e0..4abdcc7a 100644 --- a/examples/advanced_init/length_menu.html +++ b/examples/advanced_init/length_menu.html @@ -739,7 +739,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/advanced_init/row_callback.html b/examples/advanced_init/row_callback.html index e60a63ad..0df08e59 100644 --- a/examples/advanced_init/row_callback.html +++ b/examples/advanced_init/row_callback.html @@ -753,7 +753,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/advanced_init/row_grouping.html b/examples/advanced_init/row_grouping.html index bd93883c..22a416dd 100644 --- a/examples/advanced_init/row_grouping.html +++ b/examples/advanced_init/row_grouping.html @@ -805,7 +805,7 @@ tr.group:hover { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/advanced_init/sort_direction_control.html b/examples/advanced_init/sort_direction_control.html index 035115dc..eb2c0479 100644 --- a/examples/advanced_init/sort_direction_control.html +++ b/examples/advanced_init/sort_direction_control.html @@ -762,7 +762,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/ajax/custom_data_flat.html b/examples/ajax/custom_data_flat.html index ed8f8fdb..820ea90f 100644 --- a/examples/ajax/custom_data_flat.html +++ b/examples/ajax/custom_data_flat.html @@ -313,7 +313,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/ajax/custom_data_property.html b/examples/ajax/custom_data_property.html index 9f4629e2..3953b026 100644 --- a/examples/ajax/custom_data_property.html +++ b/examples/ajax/custom_data_property.html @@ -298,7 +298,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/ajax/deep.html b/examples/ajax/deep.html index 4697a551..244c44cf 100644 --- a/examples/ajax/deep.html +++ b/examples/ajax/deep.html @@ -316,7 +316,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/ajax/defer_render.html b/examples/ajax/defer_render.html index a4bef189..ac78df7a 100644 --- a/examples/ajax/defer_render.html +++ b/examples/ajax/defer_render.html @@ -285,7 +285,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/ajax/index.html b/examples/ajax/index.html index 710ecfc0..1d37ff4c 100644 --- a/examples/ajax/index.html +++ b/examples/ajax/index.html @@ -58,7 +58,7 @@ DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/ajax/null_data_source.html b/examples/ajax/null_data_source.html index c6aeab0a..5055bd60 100644 --- a/examples/ajax/null_data_source.html +++ b/examples/ajax/null_data_source.html @@ -315,7 +315,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/ajax/objects.html b/examples/ajax/objects.html index 2c8f0322..7147d14b 100644 --- a/examples/ajax/objects.html +++ b/examples/ajax/objects.html @@ -308,7 +308,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/ajax/objects_subarrays.html b/examples/ajax/objects_subarrays.html index 68fa9eab..de125532 100644 --- a/examples/ajax/objects_subarrays.html +++ b/examples/ajax/objects_subarrays.html @@ -329,7 +329,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/ajax/simple.html b/examples/ajax/simple.html index e34ab2fb..3b1faf4b 100644 --- a/examples/ajax/simple.html +++ b/examples/ajax/simple.html @@ -299,7 +299,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/api/add_row.html b/examples/api/add_row.html index e103dadb..c0a2290a 100644 --- a/examples/api/add_row.html +++ b/examples/api/add_row.html @@ -306,7 +306,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/api/api_in_init.html b/examples/api/api_in_init.html index 81fe5099..8d651889 100644 --- a/examples/api/api_in_init.html +++ b/examples/api/api_in_init.html @@ -756,7 +756,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/api/counter_columns.html b/examples/api/counter_columns.html index e2542bad..a8dbbba6 100644 --- a/examples/api/counter_columns.html +++ b/examples/api/counter_columns.html @@ -765,7 +765,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/api/form.html b/examples/api/form.html index 79a37da8..1e1c15aa 100644 --- a/examples/api/form.html +++ b/examples/api/form.html @@ -1823,7 +1823,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/api/highlight.html b/examples/api/highlight.html index 53f990b4..2c27a581 100644 --- a/examples/api/highlight.html +++ b/examples/api/highlight.html @@ -771,7 +771,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/api/index.html b/examples/api/index.html index 39ca183b..1d1fd82c 100644 --- a/examples/api/index.html +++ b/examples/api/index.html @@ -59,7 +59,7 @@ DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/api/multi_filter.html b/examples/api/multi_filter.html index 45804b5b..e887c686 100644 --- a/examples/api/multi_filter.html +++ b/examples/api/multi_filter.html @@ -775,7 +775,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/api/multi_filter_select.html b/examples/api/multi_filter_select.html index f0b67917..1fbec3dd 100644 --- a/examples/api/multi_filter_select.html +++ b/examples/api/multi_filter_select.html @@ -766,7 +766,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/api/regex.html b/examples/api/regex.html index b3108eb9..4aca4c37 100644 --- a/examples/api/regex.html +++ b/examples/api/regex.html @@ -851,7 +851,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/api/row_details.html b/examples/api/row_details.html index 7f722983..6dfad201 100644 --- a/examples/api/row_details.html +++ b/examples/api/row_details.html @@ -392,7 +392,7 @@ tr.details td.details-control { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/api/select_row.html b/examples/api/select_row.html index 775bf112..2ab3c0d4 100644 --- a/examples/api/select_row.html +++ b/examples/api/select_row.html @@ -749,7 +749,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/api/select_single_row.html b/examples/api/select_single_row.html index b18f3d7f..7b92b660 100644 --- a/examples/api/select_single_row.html +++ b/examples/api/select_single_row.html @@ -766,7 +766,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/api/show_hide.html b/examples/api/show_hide.html index 834cc4eb..1dbf01aa 100644 --- a/examples/api/show_hide.html +++ b/examples/api/show_hide.html @@ -771,7 +771,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/api/tabs_and_scrolling.html b/examples/api/tabs_and_scrolling.html index 0f048df5..f107678b 100644 --- a/examples/api/tabs_and_scrolling.html +++ b/examples/api/tabs_and_scrolling.html @@ -767,7 +767,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/basic_init/alt_pagination.html b/examples/basic_init/alt_pagination.html index 496d1da7..f42aca2c 100644 --- a/examples/basic_init/alt_pagination.html +++ b/examples/basic_init/alt_pagination.html @@ -755,7 +755,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/basic_init/complex_header.html b/examples/basic_init/complex_header.html index 8d7e4ea9..599a2986 100644 --- a/examples/basic_init/complex_header.html +++ b/examples/basic_init/complex_header.html @@ -738,7 +738,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/basic_init/dom.html b/examples/basic_init/dom.html index 3905ba3c..5f27f3b9 100644 --- a/examples/basic_init/dom.html +++ b/examples/basic_init/dom.html @@ -801,7 +801,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/basic_init/filter_only.html b/examples/basic_init/filter_only.html index f6b5af7b..53c3d36f 100644 --- a/examples/basic_init/filter_only.html +++ b/examples/basic_init/filter_only.html @@ -732,7 +732,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/basic_init/flexible_width.html b/examples/basic_init/flexible_width.html index 5f337475..49cc826b 100644 --- a/examples/basic_init/flexible_width.html +++ b/examples/basic_init/flexible_width.html @@ -735,7 +735,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/basic_init/hidden_columns.html b/examples/basic_init/hidden_columns.html index 1433f557..9c962d7d 100644 --- a/examples/basic_init/hidden_columns.html +++ b/examples/basic_init/hidden_columns.html @@ -761,7 +761,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/basic_init/index.html b/examples/basic_init/index.html index a6534191..9fbb14f3 100644 --- a/examples/basic_init/index.html +++ b/examples/basic_init/index.html @@ -61,7 +61,7 @@ DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/basic_init/language.html b/examples/basic_init/language.html index bfd677f6..c86c40ac 100644 --- a/examples/basic_init/language.html +++ b/examples/basic_init/language.html @@ -742,7 +742,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/basic_init/multi_col_sort.html b/examples/basic_init/multi_col_sort.html index 413eeec3..cedd67ab 100644 --- a/examples/basic_init/multi_col_sort.html +++ b/examples/basic_init/multi_col_sort.html @@ -699,7 +699,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/basic_init/multiple_tables.html b/examples/basic_init/multiple_tables.html index 016083c3..7009843e 100644 --- a/examples/basic_init/multiple_tables.html +++ b/examples/basic_init/multiple_tables.html @@ -530,7 +530,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/basic_init/scroll_x.html b/examples/basic_init/scroll_x.html index ebdb3daa..ee892f93 100644 --- a/examples/basic_init/scroll_x.html +++ b/examples/basic_init/scroll_x.html @@ -909,7 +909,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/basic_init/scroll_xy.html b/examples/basic_init/scroll_xy.html index 7b0d77e9..617ed2ec 100644 --- a/examples/basic_init/scroll_xy.html +++ b/examples/basic_init/scroll_xy.html @@ -902,7 +902,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/basic_init/scroll_y.html b/examples/basic_init/scroll_y.html index 787c5c59..99a229de 100644 --- a/examples/basic_init/scroll_y.html +++ b/examples/basic_init/scroll_y.html @@ -744,7 +744,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/basic_init/scroll_y_theme.html b/examples/basic_init/scroll_y_theme.html index 571b3d0d..57da4e7d 100644 --- a/examples/basic_init/scroll_y_theme.html +++ b/examples/basic_init/scroll_y_theme.html @@ -735,7 +735,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/basic_init/state_save.html b/examples/basic_init/state_save.html index eee55858..7d93bd78 100644 --- a/examples/basic_init/state_save.html +++ b/examples/basic_init/state_save.html @@ -744,7 +744,7 @@ $('#example').dataTable( { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/basic_init/table_sorting.html b/examples/basic_init/table_sorting.html index f5d67ea6..1d0732bf 100644 --- a/examples/basic_init/table_sorting.html +++ b/examples/basic_init/table_sorting.html @@ -739,7 +739,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/basic_init/zero_configuration.html b/examples/basic_init/zero_configuration.html index ab5443eb..0435d17f 100644 --- a/examples/basic_init/zero_configuration.html +++ b/examples/basic_init/zero_configuration.html @@ -728,7 +728,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/data_sources/ajax.html b/examples/data_sources/ajax.html index 7056c7be..51ccb99f 100644 --- a/examples/data_sources/ajax.html +++ b/examples/data_sources/ajax.html @@ -286,7 +286,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/data_sources/dom.html b/examples/data_sources/dom.html index 25dfb21a..fea9acf2 100644 --- a/examples/data_sources/dom.html +++ b/examples/data_sources/dom.html @@ -728,7 +728,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/data_sources/index.html b/examples/data_sources/index.html index 7411f870..fdb0d80d 100644 --- a/examples/data_sources/index.html +++ b/examples/data_sources/index.html @@ -57,7 +57,7 @@ DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/data_sources/js_array.html b/examples/data_sources/js_array.html index dcb055b1..47c05608 100644 --- a/examples/data_sources/js_array.html +++ b/examples/data_sources/js_array.html @@ -396,7 +396,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/data_sources/server_side.html b/examples/data_sources/server_side.html index 9575ec9b..8755167b 100644 --- a/examples/data_sources/server_side.html +++ b/examples/data_sources/server_side.html @@ -287,7 +287,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/plug-ins/api.html b/examples/plug-ins/api.html index 4ceb4c06..5328c4d9 100644 --- a/examples/plug-ins/api.html +++ b/examples/plug-ins/api.html @@ -780,7 +780,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/plug-ins/dom_sort.html b/examples/plug-ins/dom_sort.html index bcb019e4..a4aa280b 100644 --- a/examples/plug-ins/dom_sort.html +++ b/examples/plug-ins/dom_sort.html @@ -1872,7 +1872,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/plug-ins/index.html b/examples/plug-ins/index.html index 9c01b48b..97c265d0 100644 --- a/examples/plug-ins/index.html +++ b/examples/plug-ins/index.html @@ -53,7 +53,7 @@ DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/plug-ins/range_filtering.html b/examples/plug-ins/range_filtering.html index 14c1cce2..bf2a1cd2 100644 --- a/examples/plug-ins/range_filtering.html +++ b/examples/plug-ins/range_filtering.html @@ -789,7 +789,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/plug-ins/sorting_auto.html b/examples/plug-ins/sorting_auto.html index 6c84ea7b..61b6200c 100644 --- a/examples/plug-ins/sorting_auto.html +++ b/examples/plug-ins/sorting_auto.html @@ -761,7 +761,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/plug-ins/sorting_manual.html b/examples/plug-ins/sorting_manual.html index e994a520..201a1f2e 100644 --- a/examples/plug-ins/sorting_manual.html +++ b/examples/plug-ins/sorting_manual.html @@ -758,7 +758,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/server_side/custom_vars.html b/examples/server_side/custom_vars.html index 5332dabf..4f3054b1 100644 --- a/examples/server_side/custom_vars.html +++ b/examples/server_side/custom_vars.html @@ -301,7 +301,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/server_side/defer_loading.html b/examples/server_side/defer_loading.html index f419b4da..144a68d4 100644 --- a/examples/server_side/defer_loading.html +++ b/examples/server_side/defer_loading.html @@ -371,7 +371,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/server_side/ids.html b/examples/server_side/ids.html index a3644287..1c8d10c5 100644 --- a/examples/server_side/ids.html +++ b/examples/server_side/ids.html @@ -305,7 +305,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/server_side/index.html b/examples/server_side/index.html index fd285048..9b27ee3a 100644 --- a/examples/server_side/index.html +++ b/examples/server_side/index.html @@ -66,7 +66,7 @@ DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/server_side/jsonp.html b/examples/server_side/jsonp.html index b7f935e7..908ace60 100644 --- a/examples/server_side/jsonp.html +++ b/examples/server_side/jsonp.html @@ -294,7 +294,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/server_side/object_data.html b/examples/server_side/object_data.html index 5a2992a1..07a89db2 100644 --- a/examples/server_side/object_data.html +++ b/examples/server_side/object_data.html @@ -297,7 +297,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/server_side/pipeline.html b/examples/server_side/pipeline.html index b7b70ef4..ee29ef74 100644 --- a/examples/server_side/pipeline.html +++ b/examples/server_side/pipeline.html @@ -465,7 +465,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/server_side/post.html b/examples/server_side/post.html index f249771b..dcc28f88 100644 --- a/examples/server_side/post.html +++ b/examples/server_side/post.html @@ -309,7 +309,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/server_side/row_details.html b/examples/server_side/row_details.html index 70dd3cc9..140469c9 100644 --- a/examples/server_side/row_details.html +++ b/examples/server_side/row_details.html @@ -371,7 +371,7 @@ tr.details td.details-control { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/server_side/select_rows.html b/examples/server_side/select_rows.html index 50448c25..9c005686 100644 --- a/examples/server_side/select_rows.html +++ b/examples/server_side/select_rows.html @@ -322,7 +322,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/server_side/simple.html b/examples/server_side/simple.html index 1907c83f..f05eb827 100644 --- a/examples/server_side/simple.html +++ b/examples/server_side/simple.html @@ -286,7 +286,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/styling/bootstrap.html b/examples/styling/bootstrap.html index cf14c25d..ab1ffa99 100644 --- a/examples/styling/bootstrap.html +++ b/examples/styling/bootstrap.html @@ -740,7 +740,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/styling/cell-border.html b/examples/styling/cell-border.html index ea96b830..d3168c9f 100644 --- a/examples/styling/cell-border.html +++ b/examples/styling/cell-border.html @@ -725,7 +725,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/styling/display.html b/examples/styling/display.html index 5198b48c..486bca84 100644 --- a/examples/styling/display.html +++ b/examples/styling/display.html @@ -741,7 +741,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/styling/foundation.html b/examples/styling/foundation.html index 52378a64..b4f0f427 100644 --- a/examples/styling/foundation.html +++ b/examples/styling/foundation.html @@ -739,7 +739,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/styling/hover.html b/examples/styling/hover.html index f41240ed..aa0564a0 100644 --- a/examples/styling/hover.html +++ b/examples/styling/hover.html @@ -725,7 +725,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/styling/index.html b/examples/styling/index.html index 4a0dbbdc..7c69a828 100644 --- a/examples/styling/index.html +++ b/examples/styling/index.html @@ -60,7 +60,7 @@ DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/styling/jqueryUI.html b/examples/styling/jqueryUI.html index fe4016a4..679e4ec6 100644 --- a/examples/styling/jqueryUI.html +++ b/examples/styling/jqueryUI.html @@ -744,7 +744,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/styling/no-classes.html b/examples/styling/no-classes.html index 425cd1c8..5809e967 100644 --- a/examples/styling/no-classes.html +++ b/examples/styling/no-classes.html @@ -725,7 +725,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/styling/order-column.html b/examples/styling/order-column.html index f0d98b50..bc49be75 100644 --- a/examples/styling/order-column.html +++ b/examples/styling/order-column.html @@ -726,7 +726,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/styling/row-border.html b/examples/styling/row-border.html index 264ab966..6d3c690a 100644 --- a/examples/styling/row-border.html +++ b/examples/styling/row-border.html @@ -725,7 +725,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/examples/styling/stripe.html b/examples/styling/stripe.html index 24478b3d..dad0e1e6 100644 --- a/examples/styling/stripe.html +++ b/examples/styling/stripe.html @@ -724,7 +724,7 @@ $(document).ready(function() { DataTables.

DataTables designed and created by SpryMedia Ltd © 2007-2013
+ "http://www.sprymedia.co.uk">SpryMedia Ltd © 2007-2014
DataTables is licensed under the MIT license.

diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index 61868318..c8a9361e 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -4438,7 +4438,12 @@ // Use a timeout to allow the processing display to be shown. setTimeout( function() { _fnSortListener( settings, colIdx, e.shiftKey, callback ); - _fnProcessingDisplay( settings, false ); + + // In server-side processing, the draw callback will remove the + // processing display + if ( _fnDataSource( settings ) !== 'ssp' ) { + _fnProcessingDisplay( settings, false ); + } }, 0 ); } ); }