diff --git a/web/jQuery/CXM_jquery_button.anubis b/web/jQuery/CXM_jquery_button.anubis index e649536..bf7f23f 100644 --- a/web/jQuery/CXM_jquery_button.anubis +++ b/web/jQuery/CXM_jquery_button.anubis @@ -294,11 +294,12 @@ public define HTML_Partial_Content String dlg_text, String dlg_ok, String dlg_cancel, - String url, - List((String, String)) extra_ops + JQuery_Actioner actioner + //String url, + //List((String, String)) extra_ops )= since button is jquery_img_button(img_url, button_label, button_name, actioner, orientation), - with uid = generate_random_string(20), + with uid = generate_random_string(10), js_confirm_dialog_data_obj = "CalexiumToolBox.data.confirm_dialog[" + to_js_string(uid) + "]", js_data = js_confirm_dialog_data_obj + " = { @@ -308,37 +309,13 @@ public define HTML_Partial_Content cancel: " + to_js_string(dlg_cancel) + "};", button_name = uid, - actioner = jQuery_actioner(same, jqscript, "CalexiumToolBox.make_confirm_dialog(this, " + to_js_string("/?a=" + url + format_extra_operands(extra_ops))+");"), + actioner = jQuery_actioner(same, jqscript, "CalexiumToolBox.make_confirm_dialog(this, " + to_js_string(jquery_button_get_onclick_action(actioner)) +");"), partial_content([js(js_file("js/cxm/cxm.js")), js_inline(jquery_ready(js_data))],sequence([ partial(jquery_button(jquery_img_button(img_url, button_label, button_name, actioner, orientation))) - ])). - -public define HTML_Partial_Content - jq_button_confirm - ( - String button_label, - String dlg_title, - String dlg_text, - String dlg_ok, - String dlg_cancel, - String url - )= - jq_button_confirm(button_label, dlg_title, dlg_text, dlg_ok, dlg_cancel, url, []). + ])). public define HTML_Partial_Content - jq_button_confirm - ( - JQuery_img_button button, - String dlg_title, - String dlg_text, - String dlg_ok, - String dlg_cancel, - String url - )= - jq_button_confirm(button, dlg_title, dlg_text, dlg_ok, dlg_cancel, url, []). - -public define HTML_Partial_Content img_submit_button ( String label, //translated label of the button -- libgit2 0.21.4