diff --git a/web/jQuery/CXM_jquery_datatable.anubis b/web/jQuery/CXM_jquery_datatable.anubis index d80027a..773b438 100644 --- a/web/jQuery/CXM_jquery_datatable.anubis +++ b/web/jQuery/CXM_jquery_datatable.anubis @@ -67,7 +67,7 @@ public define HTML_Partial_Content ) = partial_content(jquery_datatables_1_10_init + - [ js_inline(jquery_ready("$('#"+table_id+"').dataTable();")) ], + [ js_inline(jquery_ready("$('#"+table_id+"').DataTable();")) ], table ) . @@ -82,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({\"jQueryUI\":true});")) ], + [ js_inline(jquery_ready("$('#"+table_id+"').DataTable({\"jQueryUI\":true});")) ], table ) else @@ -98,6 +98,7 @@ public define HTML_Partial_Content Bool enable_jqueryui, Bool enable_pagination, JQuery_datatable_pagination_type pagination_type, + Bool scrollX, JQuery_datatable_scrollY_type scrollY, Bool enable_change_page_length, // if true, "enable_pagination" must be true too. Bool enable_search_field, @@ -111,14 +112,14 @@ public define HTML_Partial_Content [ js_inline(jquery_ready(" $.fn.dataTable.ext.legacy.ajax = true; - $('#"+table_id+"').dataTable( + $('#"+table_id+"').DataTable( { \"jQueryUI\":"+to_String(enable_jqueryui)+", \"pagingType\":'"+jquery_datatable_pagination_type_to_string(pagination_type)+"', \"searching\":"+to_String(enable_search_field)+", \"paging\":"+to_String(enable_pagination)+","+ // responsive: true,"+ - + "\"scrollX\": " + to_String(scrollX) + ","+ if scrollY is { no_scroll then "", @@ -152,7 +153,7 @@ public define HTML_Partial_Content Bool enable_columns_sorting, String web_dir ) = - jquery_datatable(table_id, partial_content(table), enable_jqueryui, enable_pagination, pagination_type, scrollY, enable_change_page_length, enable_search_field, enable_columns_sorting, "en", no_extra, web_dir). + jquery_datatable(table_id, partial_content(table), enable_jqueryui, enable_pagination, pagination_type, false, scrollY, enable_change_page_length, enable_search_field, enable_columns_sorting, "en", no_extra, web_dir). public define HTML_Partial_Content jquery_datatable @@ -168,4 +169,4 @@ public define HTML_Partial_Content Bool enable_columns_sorting, String web_dir ) = - jquery_datatable(table_id, table, enable_jqueryui, enable_pagination, pagination_type, scrollY, enable_change_page_length, enable_search_field, enable_columns_sorting, "en", no_extra, web_dir). + jquery_datatable(table_id, table, enable_jqueryui, enable_pagination, pagination_type, false, scrollY, enable_change_page_length, enable_search_field, enable_columns_sorting, "en", no_extra, web_dir). diff --git a/web/jQuery/CXM_jquery_tabs.anubis b/web/jQuery/CXM_jquery_tabs.anubis index ccdc821..a47c802 100644 --- a/web/jQuery/CXM_jquery_tabs.anubis +++ b/web/jQuery/CXM_jquery_tabs.anubis @@ -93,13 +93,15 @@ public define HTML_Partial_Content ui.newPanel.find('input[name=jq_tabs_" + tabs_container_id + "]').each(function () { $(this).attr('value', ui.newTab.index()); }); + + if (typeof CalexiumToolBox !== 'undefined' && typeof CalexiumToolBox.jq_tab_activate !== 'undefined') { + CalexiumToolBox.jq_tab_activate(event, ui); + } }, create: function( event, ui ) { $('#"+tabs_container_id+"').find('form').prepend(''); } }); - - ")) . tags diff --git a/web/jQuery/ui-addon/datetimepicker.anubis b/web/jQuery/ui-addon/datetimepicker.anubis index 62a33d0..d3d8070 100644 --- a/web/jQuery/ui-addon/datetimepicker.anubis +++ b/web/jQuery/ui-addon/datetimepicker.anubis @@ -34,7 +34,7 @@ public define List(HTML_Head_Tag) = [ css(css_file("js/jquery/plug-in/datetimepicker/datetimepicker.css")), - js(js_file("js/jquery/plug-in/datetimepicker/datetimepicker.js")), + js(js_file("js/jquery/plug-in/datetimepicker/datetimepicker.min.js")), js_inline(jquery_ready("// Datetimepicker\n $('.datepicker').datetimepicker({lang:'"+lang+"',timepicker:false,format:'d/m/Y'}); $('.datetimepicker').datetimepicker({lang:'"+lang+"',format:'Y-m-d H:i'}); -- libgit2 0.21.4