include minified version of "datetimepicker.js" and remove the non minified version

call to "CalexiumToolBox.jq_tab_activate" if it exist whenever a jquery ui tab is activated add scrollx parameter to jquery_datatable call change initialization call from dataTable to DataTable (non-deprecated version)

include minified version of "datetimepicker.js" and remove the non minified version
call to "CalexiumToolBox.jq_tab_activate" if it exist whenever a jquery ui tab is activated add scrollx parameter to jquery_datatable call change initialization call from dataTable to DataTable (non-deprecated version)
Julien Verneuil
1 parent 0f60e502
Showing 3 changed files with 12 additions and 9 deletions Show diff stats
web/jQuery/CXM_jquery_datatable.anubis
web/jQuery/CXM_jquery_tabs.anubis
web/jQuery/ui-addon/datetimepicker.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).
@@ -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('<input type=\"hidden\" name=\"jq_tabs_" + tabs_container_id + "\" value=\"'+ui.tab.index()+'\">');
                 }
               });
-
-            
           "))
           .
           tags
@@ -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'});