diff --git a/web/CXM_making_a_web_site.anubis b/web/CXM_making_a_web_site.anubis index 54c6b7a..1670309 100644 --- a/web/CXM_making_a_web_site.anubis +++ b/web/CXM_making_a_web_site.anubis @@ -5962,8 +5962,8 @@ public define HTML_ajax_content { meta(meta) then sort_head_tag(t, script, js_file, css_file), title(title) then sort_head_tag(t, script, js_file, css_file), - js(jsf) then sort_head_tag(t, script, [file_name(jsf) . js_file], css_file), - js_inline(jsi) then sort_head_tag(t, script + content(jsi), js_file, css_file), + js(jsf) then /*println("sort_head_tag jsf["+jsf.file_name+"]");*/sort_head_tag(t, script, [file_name(jsf) . js_file], css_file), + js_inline(jsi) then /*println("sort_head_tag jsi["+jsi.content+"]");*/sort_head_tag(t, script + content(jsi), js_file, css_file), css(cssf) then sort_head_tag(t, script, js_file, [file_name(cssf) . css_file]), css_inline(cssi) then sort_head_tag(t, script, js_file, css_file) } @@ -5975,6 +5975,7 @@ public define HTML_ajax_content HTML_Off_Form content_HTML, CommonInfo cinfo )= + //println("to_html_ajax_content(content_HTML, cinfo)"); with p_content_head_tags = var((List(HTML_Head_Tag))[]), with content = format(cinfo, var((Int)0), content_HTML, false, var(0), p_content_head_tags), if sort_head_tag(*p_content_head_tags, "", [], []) is html_ajax_content(_, script, js_file, css_file) then @@ -5988,6 +5989,8 @@ public define JsonValue CommonInfo cinfo, String additional_script )= + //println("to_html_ajax_content(content_HTML, cinfo, additional_script)"); + //println("additional_script"+additional_script); since to_html_ajax_content(partial(content_HTML), cinfo) is html_ajax_content(html, script, js_files, css_files), json_object([ json_member("html", json_string(html)), diff --git a/web/jQuery/CXM_jquery_dialog.anubis b/web/jQuery/CXM_jquery_dialog.anubis index 5432b02..3f74905 100644 --- a/web/jQuery/CXM_jquery_dialog.anubis +++ b/web/jQuery/CXM_jquery_dialog.anubis @@ -29,19 +29,21 @@ public define HTML_Partial_Content String extra_param )= with dlg_id = id(dial_id), - js = js_inline(jquery_ready(" - $( \"#"+dlg_id+"\" ).dialog({ - autoOpen: "+to_String(autoOpen)+", - modal: true, - height: 'auto', - width: 'auto', - "+extra_param+" - Cancel: function() { - $( this ).dialog( 'close' ); - } - }); - ")), - + js_str = +" +$( \"#"+dlg_id+"\" ).dialog({ + autoOpen: "+to_String(autoOpen)+", + modal: true, + height: 'auto', + width: 'auto', + "+extra_param+" + Cancel: function() { + $( this ).dialog( 'close' ); + } + }); +", + js = js_inline(jquery_ready(js_str)), + if content is { p_content(pc) then @@ -51,6 +53,7 @@ public define HTML_Partial_Content partial_content( [js], html), //html code of the dialog ajax(_url) then with url = format_web_action_name(_url), + //println("jq_dialog_create : \njs_str ->"+js_str+"\nurl ->"+url); partial_content( [js], div_empty([id(dlg_id), attr("ajax_url",url)])) }. -- libgit2 0.21.4