From e5f23786a3e1bf39a1b9917f4b2d512791c16372 Mon Sep 17 00:00:00 2001 From: totoro Date: Sun, 26 Jan 2020 17:37:41 +0100 Subject: [PATCH] img_button_confirm take a new argument which is the target_id of load_content. So the behavior of this function change as follow. When the target_id is empty the jq_query function is use to submit the result else this is the ajax_load_content. --- web/widgets/button.anubis | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/web/widgets/button.anubis b/web/widgets/button.anubis index 5c37e53..fe54923 100644 --- a/web/widgets/button.anubis +++ b/web/widgets/button.anubis @@ -11,6 +11,7 @@ transmit calexium_lib/web/CXM_jquery.anubis read calexium_lib/web/CXM_json.anubis read calexium_lib/web/js_tools.anubis transmit calexium_lib/web/widgets/icons_set.anubis +read calexium_lib/web/load_content.anubis read tools/basis.anubis read tools/printable_tree.anubis @@ -153,10 +154,15 @@ define List(CoreAttrs) List(CoreAttrs) core_attrs, String uid, WEB_Action_Name web_action, - List((String, String)) extra_ops + List((String, String)) extra_ops, + String load_content_target ) = //action to execute if confirmation is ok - with ok_action = to_JS_String("CalexiumToolBox.jq_query("+format_web_action_name_to_js(web_action, extra_ops)+")"), + + with ok_action = if load_content_target = "" then + to_JS_String("CalexiumToolBox.jq_query("+format_web_action_name_to_js(web_action, extra_ops)+")") + else + to_JS_String("CalexiumToolBox.ajax_load_content('"+load_content_target+"', "+format_web_action_name_to_js(web_action, extra_ops)+", true)"), core_attrs + [id(uid), style("cursor: pointer"), event(onclick, "CalexiumToolBox.make_confirm_dialog(this, "+ ok_action +");")]. @@ -242,17 +248,27 @@ public define HTML_Partial_Content String dlg_ok, String dlg_cancel, WEB_Action_Name web_action, - List((String, String)) extra_ops + List((String, String)) extra_ops, + String load_content_target //if empty doesn't use load content ) = with uid = generate_random_string(20), //with event_click = (CoreAttrs)event(onclick, "CalexiumToolBox.jq_query("+format_web_action_name_to_js(web_action, extra_ops)+")"), partial_content([js(js_file("js/cxm/cxm.js")), js_inline(jquery_ready(img_button_confirm_js(uid, dlg_title, dlg_text, dlg_ok, dlg_cancel)))], - img(img_button_confirm_image_attrs(core_attrs, uid, web_action, extra_ops), img_path)) + img(img_button_confirm_image_attrs(core_attrs, uid, web_action, extra_ops, load_content_target), img_path)) . - - - "" + - "" +public define HTML_Partial_Content + img_button_confirm + ( + String img_path, + List(CoreAttrs) core_attrs, + String dlg_title, + String dlg_text, + String dlg_ok, + String dlg_cancel, + WEB_Action_Name web_action, + List((String, String)) extra_ops + ) = + img_button_confirm(img_path, core_attrs, dlg_title, dlg_text, dlg_ok, dlg_cancel, web_action, extra_ops, "") . -- libgit2 0.21.4