diff --git a/web/jQuery/CXM_jquery_button.anubis b/web/jQuery/CXM_jquery_button.anubis index 154305f..93ec457 100644 --- a/web/jQuery/CXM_jquery_button.anubis +++ b/web/jQuery/CXM_jquery_button.anubis @@ -10,6 +10,7 @@ transmit calexium_lib/web/CXM_making_a_web_site.anubis transmit calexium_lib/web/CXM_jquery.anubis transmit calexium_lib/web/jQuery/CXM_jquery_icons.anubis +transmit calexium_lib/web/js_tools.anubis transmit tools/basis.anubis transmit system/string.anubis transmit tools/random.anubis @@ -353,26 +354,20 @@ public define HTML_Partial_Content String url, List((String, String)) extra_ops )= - with button_id = generate_random_string(10), - button_name = button_id, - actioner = jQuery_actioner(same, jqscript, " - - $( '#" + button_id + "_dlg' ).dialog({ - title: '" + dlg_title + "', - resizable: false, - modal: true, - buttons: { - '" + dlg_ok + "': function() { - document.location='/?a=" + url + format_extra_operands(extra_ops)+"'; - }, - '" + dlg_cancel + "': function() { - $( this ).dialog( 'close' ); - } - } - });"), - partial_content(sequence([ - div([id(button_id+"_dlg"),style("display: none;")], text(dlg_text)), - partial(jquery_button(jQuery_button(button, button_id, button_name, button_label, actioner, jq_icon_none, jq_icon_none))) + with uid = generate_random_string(20), + + js_confirm_dialog_data_obj = "CalexiumToolBox.data.confirm_dialog[" + to_js_string(uid) + "]", + js_data = js_confirm_dialog_data_obj + " = { + title: " + to_js_string(dlg_title) + ", + text: " + to_js_string(dlg_text) + ", + ok : " + to_js_string(dlg_ok) + ", + 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))+");"), + + partial_content([js(js_file("js/cxm/cxm.js")), js_inline(jquery_ready(js_data))],sequence([ + partial(jquery_button(jQuery_button(button, uid, button_name, button_label, actioner, jq_icon_none, jq_icon_none))) ])). -- libgit2 0.21.4