From 5b85c04ccb6f2723207bb2b0640de7ec64850665 Mon Sep 17 00:00:00 2001 From: totoro Date: Thu, 2 Mar 2017 12:34:29 +0100 Subject: [PATCH] made more compatible with WEB_Action --- web/CXM_jquery.anubis | 4 +++- web/jQuery/CXM_jq_checkbox.anubis | 2 +- web/jQuery/CXM_jq_radio.anubis | 4 ++-- web/jQuery/CXM_jquery_dialog.anubis | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/web/CXM_jquery.anubis b/web/CXM_jquery.anubis index dd94524..68e92c1 100644 --- a/web/CXM_jquery.anubis +++ b/web/CXM_jquery.anubis @@ -6,7 +6,7 @@ * */ -read calexium_lib/web/CXM_making_a_web_site.anubis +transmit calexium_lib/web/CXM_making_a_web_site.anubis read tools/printable_tree.anubis read tools/basis.anubis @@ -18,6 +18,8 @@ public type JQuery_Actioner_type: jqscript( String script) . +public define JQuery_Actioner_type jqlink(String name) = jqlink(action_name(name)). + /* jQuery Actioner */ public type JQuery_Actioner: jQuery_actioner(Actioner_Target target, JQuery_Actioner_type type). //, String url_or_form_id_or_script diff --git a/web/jQuery/CXM_jq_checkbox.anubis b/web/jQuery/CXM_jq_checkbox.anubis index 5de5c79..9788d23 100644 --- a/web/jQuery/CXM_jq_checkbox.anubis +++ b/web/jQuery/CXM_jq_checkbox.anubis @@ -58,7 +58,7 @@ public define HTML_Partial_Content [ js_inline(jquery_ready(checkbox_init_script(checkbox_id, initial_state))) ], - jquery_button(jquery_img_button(image_url, checkbox_label, checkbox_id, jQuery_actioner(same, jqscript, checkbox_onclick_script(checkbox_id, on_script, off_script)), orientation)) + jquery_button(jquery_img_button(image_url, checkbox_label, checkbox_id, jQuery_actioner(same, jqscript(checkbox_onclick_script(checkbox_id, on_script, off_script))), orientation)) ). public define HTML_Partial_Content diff --git a/web/jQuery/CXM_jq_radio.anubis b/web/jQuery/CXM_jq_radio.anubis index 95ab273..570a361 100644 --- a/web/jQuery/CXM_jq_radio.anubis +++ b/web/jQuery/CXM_jq_radio.anubis @@ -1,4 +1,4 @@ -/* +/* * Created by PyramIDE. * User: フランスのトトロ * Date: 28/06/2015 @@ -96,7 +96,7 @@ public define HTML_Partial_Content [ js_inline(jquery_ready(radio_init_script(radio_id, radio_group, initial_state))) ], - jquery_button(jquery_img_button(image_url, checkbox_label, radio_id, jQuery_actioner(same, jqscript, radio_onclick_script(radio_id, radio_group, multi_select_with_shift, on_script)), orientation)) + jquery_button(jquery_img_button(image_url, checkbox_label, radio_id, jQuery_actioner(same, jqscript(radio_onclick_script(radio_id, radio_group, multi_select_with_shift, on_script))), orientation)) ). public define HTML_Partial_Content diff --git a/web/jQuery/CXM_jquery_dialog.anubis b/web/jQuery/CXM_jquery_dialog.anubis index 90e23df..5432b02 100644 --- a/web/jQuery/CXM_jquery_dialog.anubis +++ b/web/jQuery/CXM_jquery_dialog.anubis @@ -18,6 +18,7 @@ public type JQuery_dialog: off_form(HTML_Off_Form o_form), ajax(WEB_Action_Name url). +public define JQuery_dialog ajax(String url) = ajax(action_name(url)). public define HTML_Partial_Content jq_dialog_create -- libgit2 0.21.4