From 2ecb5f1629e32d0b431f710dc88833f2c5ef4cdd Mon Sep 17 00:00:00 2001 From: Julien Verneuil Date: Tue, 26 Apr 2016 08:21:27 +0200 Subject: [PATCH] update datatable to use 1.10.x features instead of the legacy features (note: still force legacy Ajax) --- web/jQuery/CXM_jquery_datatable.anubis | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/web/jQuery/CXM_jquery_datatable.anubis b/web/jQuery/CXM_jquery_datatable.anubis index d45858f..d80027a 100644 --- a/web/jQuery/CXM_jquery_datatable.anubis +++ b/web/jQuery/CXM_jquery_datatable.anubis @@ -46,11 +46,15 @@ public define List(HTML_Head_Tag) [ //css(css_file("jquery/plug-in/DataTables-1.10.7/media/css/jquery.dataTables.min.css")), //css(css_file("jquery/plug-in/DataTables-1.10.7/media/css/jquery.dataTables_themeroller.css")), - js(js_file("js/jquery/plug-in/DataTables-1.10.7/media/js/jquery.dataTables.min.js")), - js(js_file("js/jquery/plug-in/DataTables-1.10.7/media/js/dataTables.jqueryui.js")) , //only for datatable 1.10 - css(css_file("js/jquery/plug-in/DataTables-1.10.7/media/css/dataTables.jqueryui.css")), //only for datatable 1.10 - css(css_file("js/jquery/plug-in/DataTables-1.10.7/extensions/Scroller/css/dataTables.scroller.min.css")), - js(js_file("js/jquery/plug-in/DataTables-1.10.7/extensions/Scroller/js/dataTables.scroller.js")), + + js(js_file("js/jquery/plug-in/datatables.min.js")), + css(css_file("css/jquery/datatables.min.css")), + //js(js_file("js/jquery/plug-in/DataTables-1.10.7/media/js/jquery.dataTables.min.js")), + //js(js_file("js/jquery/plug-in/DataTables-1.10.7/media/js/dataTables.jqueryui.js")) , //only for datatable 1.10 + //css(css_file("js/jquery/plug-in/DataTables-1.10.7/media/css/dataTables.jqueryui.css")), //only for datatable 1.10 + //css(css_file("js/jquery/plug-in/DataTables-1.10.7/extensions/Scroller/css/dataTables.scroller.min.css")), + //js(js_file("js/jquery/plug-in/DataTables-1.10.7/extensions/Scroller/js/dataTables.scroller.js")), + // css(css_file("jquery/plug-in/DataTables-1.10.7/extensions/Responsive/css/dataTables.responsive.css")), // js(js_file("jquery/plug-in/DataTables-1.10.7/extensions/responsive/js/dataTables.responsive.js")), ] @@ -78,7 +82,7 @@ public define HTML_Partial_Content = if enable_jqueryui then partial_content( jquery_datatables_1_10_init + - [ js_inline(jquery_ready("$('#"+table_id+"').dataTable({\"bJQueryUI\":true});")) ], + [ js_inline(jquery_ready("$('#"+table_id+"').dataTable({\"jQueryUI\":true});")) ], table ) else @@ -106,22 +110,23 @@ public define HTML_Partial_Content partial_content( jquery_datatables_1_10_init + [ js_inline(jquery_ready(" + $.fn.dataTable.ext.legacy.ajax = true; $('#"+table_id+"').dataTable( { \"jQueryUI\":"+to_String(enable_jqueryui)+", - \"sPaginationType\":'"+jquery_datatable_pagination_type_to_string(pagination_type)+"', - \"bFilter\":"+to_String(enable_search_field)+", - \"bPaginate\":"+to_String(enable_pagination)+","+ + \"pagingType\":'"+jquery_datatable_pagination_type_to_string(pagination_type)+"', + \"searching\":"+to_String(enable_search_field)+", + \"paging\":"+to_String(enable_pagination)+","+ // responsive: true,"+ if scrollY is { no_scroll then "", - scrollY(size) then "\"sScrollY\": \""+size+"px\"," + scrollY(size) then "\"scrollY\": \""+size+"px\"," }+ - "\"bStateSave\": true, - \"bLengthChange\":"+to_String(enable_change_page_length)+", - \"bSort\":"+to_String(enable_columns_sorting)+","+ + "\"stateSave\": true, + \"lengthChange\":"+to_String(enable_change_page_length)+", + \"ordering\":"+to_String(enable_columns_sorting)+","+ get_datatable_translation(lang, web_dir)+ jquery_datatable_extra_to_string(extra)+ "}); -- libgit2 0.21.4