Commit bb33baab801160b0838cf82eea0875605ddfd8d6
1 parent
422f3aa9
bump to jquery 1.11.1
add datatable scroller add jQplot support
Showing
5 changed files
with
75 additions
and
25 deletions
Show diff stats
web/CXM_jquery.anubis
web/CXM_making_a_web_site.anubis
web/jQuery/CXM_jquery_datatable.anubis
| ... | ... | @@ -23,16 +23,18 @@ public define List(HTML_Head_Tag) |
| 23 | 23 | ) |
| 24 | 24 | = |
| 25 | 25 | [ |
| 26 | - css(css_file("/css/jquery/jquery.dataTables.min.css")), | |
| 27 | - css(css_file("/css/jquery/jquery.dataTables_themeroller.min.css")), | |
| 26 | + css(css_file("/css/jquery/jquery.dataTables.css")), | |
| 27 | + css(css_file("/css/jquery/jquery.dataTables_themeroller.css")), | |
| 28 | 28 | js(js_file("/js/jquery/jquery.dataTables.min.js")), |
| 29 | - css(css_file("js/jquery/dataTables/extensions/Scroller/css/dataTables.scroller.min.css")), | |
| 29 | + js(js_file("js/jquery/dataTables/dataTables.jqueryui.js")) , | |
| 30 | + css(css_file("js/jquery/dataTables/extensions/Scroller/css/shCore.css")), | |
| 31 | + css(css_file("js/jquery/dataTables/extensions/Scroller/css/shThemeDataTables.css")), | |
| 32 | + css(css_file("js/jquery/dataTables/extensions/Scroller/css/doc.css")), | |
| 33 | + css(css_file("js/jquery/dataTables/extensions/Scroller/css/dataTables.scroller.css")), | |
| 30 | 34 | js(js_file("js/jquery/dataTables/extensions/Scroller/js/dataTables.scroller.min.js")), |
| 31 | - | |
| 32 | 35 | ] |
| 33 | 36 | . |
| 34 | 37 | |
| 35 | - | |
| 36 | 38 | public define HTML_Partial_Content |
| 37 | 39 | jquery_datatable |
| 38 | 40 | ( | ... | ... |
web/jQuery/CXM_jquery_datatable_types.anubis
| ... | ... | @@ -11,14 +11,10 @@ read calexium_lib/web/CXM_making_a_web_site.anubis |
| 11 | 11 | read tools/basis.anubis |
| 12 | 12 | read system/string.anubis |
| 13 | 13 | |
| 14 | - pagingType Since: 1.10 | |
| 15 | - Pagination button display options | |
| 16 | - | |
| 14 | + | |
| 17 | 15 | public type JQuery_datatable_pagination_type: |
| 18 | - jq_dt_pt_simple, //'Previous' and 'Next' buttons only | |
| 19 | - jq_dt_pt_simple_numbers, //'Previous' and 'Next' buttons, plus page numbers (default option) | |
| 20 | - jq_dt_pt_full, //'First', 'Previous', 'Next' and 'Last' buttons | |
| 21 | - jq_dt_pt_full_numbers //'First', 'Previous', 'Next' and 'Last' buttons, plus page numbers | |
| 16 | + jq_dt_pt_two_button, //default option | |
| 17 | + jq_dt_pt_full_numbers | |
| 22 | 18 | . |
| 23 | 19 | public type JQuery_datatable_scrollY_type: |
| 24 | 20 | no_scroll, |
| ... | ... | @@ -45,13 +41,12 @@ public define String |
| 45 | 41 | JQuery_datatable_pagination_type pt |
| 46 | 42 | ) |
| 47 | 43 | = |
| 48 | - if pt is | |
| 49 | - { | |
| 50 | - jq_dt_pt_simple then "simple", | |
| 51 | - jq_dt_pt_simple_numbers then "simple_numbers", | |
| 52 | - jq_dt_pt_full then "full", | |
| 53 | - jq_dt_pt_full_numbers then "full_numbers", | |
| 54 | - }. | |
| 44 | + if pt is | |
| 45 | + { | |
| 46 | + jq_dt_pt_two_button then "two_button", | |
| 47 | + jq_dt_pt_full_numbers then "full_numbers" | |
| 48 | + } | |
| 49 | + . | |
| 55 | 50 | |
| 56 | 51 | public define JQuery_datatable_pagination_type |
| 57 | 52 | string_to_jquery_datatable_pagination_type |
| ... | ... | @@ -60,11 +55,9 @@ public define JQuery_datatable_pagination_type |
| 60 | 55 | ) |
| 61 | 56 | = |
| 62 | 57 | with st=to_lower(str), |
| 63 | - if st="simple" then jq_dt_pt_simple else | |
| 64 | - if st="simple_numbers" then jq_dt_pt_simple_numbers else | |
| 65 | - if st="full" then jq_dt_pt_full else | |
| 58 | + if st="two_button" then jq_dt_pt_two_button else | |
| 66 | 59 | if st="full_numbers" then jq_dt_pt_full_numbers else |
| 67 | - jq_dt_pt_simple_numbers | |
| 60 | + jq_dt_pt_two_button | |
| 68 | 61 | . |
| 69 | 62 | |
| 70 | 63 | public type JQuery_datatable_server_side_type: | ... | ... |
| 1 | +/* | |
| 2 | + * Created by PyramIDE. | |
| 3 | + * User: Totoro | |
| 4 | + * Date: 17/05/2014 | |
| 5 | + * Time: 12:19 | |
| 6 | + * | |
| 7 | + */ | |
| 8 | + | |
| 9 | +read calexium_lib/web/CXM_making_a_web_site.anubis | |
| 10 | +read tools/basis.anubis | |
| 11 | + | |
| 12 | + public define HTML_Partial_Content | |
| 13 | + jqplot | |
| 14 | + ( | |
| 15 | + String img_url, | |
| 16 | + String label_text, | |
| 17 | + String action | |
| 18 | + )= | |
| 19 | + partial_content( | |
| 20 | + [ | |
| 21 | + js_inline(script("","$(document).ready(function(){$('#jq_img_btn').button();});")) | |
| 22 | + ], | |
| 23 | + div([id("jq_img_btn")], | |
| 24 | + table([ | |
| 25 | + row( cell( actioner(same,same, img_link(img_url, label_text), action, []))), | |
| 26 | + row( cell( actioner(same,same, link(label_text), action, []))) | |
| 27 | + ] | |
| 28 | + ) | |
| 29 | + )) | |
| 30 | + | |
| 31 | + . | |
| 32 | + | |
| 33 | +public define HTML_Head_Tag | |
| 34 | + jqplot_plugin | |
| 35 | + ( | |
| 36 | + String plugin | |
| 37 | + )= | |
| 38 | + js(js_file("/js/jquery/jqplot/plugins/jqplot."+plugin+".min.js")) | |
| 39 | + . | |
| 40 | + | |
| 41 | +/* jQuery default js files */ | |
| 42 | +define List(HTML_Head_Tag) | |
| 43 | + jqplot_defaults | |
| 44 | + = | |
| 45 | + [ | |
| 46 | + js(js_file("/js/jquery/jqplot/jquery.jqplot.min.js")), | |
| 47 | + css(css_file("/js/jquery/jqplot/jquery.jqplot.min.css")), | |
| 48 | + ]. | |
| 49 | + | |
| 50 | + | |
| 51 | +/* Initialize jQuery in compatiblity mode with jQueryUI */ | |
| 52 | +public define List(HTML_Head_Tag) | |
| 53 | + jqplot_init | |
| 54 | + = | |
| 55 | + jqplot_defaults. | ... | ... |