Anubis / Xlib

Commit b22d0e086eaa214cdf9fccb098237ba5304dae2f

Authored by totoro
1 parent 2d8091d5

add some debugging stuff

Showing 2 changed files with 21 additions and 15 deletions   Show diff stats
Inline Side-by-side
web/CXM_making_a_web_site.anubis
  Show/Hide comments   View file @b22d0e0
... ... @@ -5962,8 +5962,8 @@ public define HTML_ajax_content
5962 5962 {
5963 5963 meta(meta) then sort_head_tag(t, script, js_file, css_file),
5964 5964 title(title) then sort_head_tag(t, script, js_file, css_file),
5965   - js(jsf) then sort_head_tag(t, script, [file_name(jsf) . js_file], css_file),
5966   - js_inline(jsi) then sort_head_tag(t, script + content(jsi), js_file, css_file),
  5965 + js(jsf) then /*println("sort_head_tag jsf["+jsf.file_name+"]");*/sort_head_tag(t, script, [file_name(jsf) . js_file], css_file),
  5966 + js_inline(jsi) then /*println("sort_head_tag jsi["+jsi.content+"]");*/sort_head_tag(t, script + content(jsi), js_file, css_file),
5967 5967 css(cssf) then sort_head_tag(t, script, js_file, [file_name(cssf) . css_file]),
5968 5968 css_inline(cssi) then sort_head_tag(t, script, js_file, css_file)
5969 5969 }
... ... @@ -5975,6 +5975,7 @@ public define HTML_ajax_content
5975 5975 HTML_Off_Form content_HTML,
5976 5976 CommonInfo cinfo
5977 5977 )=
  5978 + //println("to_html_ajax_content(content_HTML, cinfo)");
5978 5979 with p_content_head_tags = var((List(HTML_Head_Tag))[]),
5979 5980 with content = format(cinfo, var((Int)0), content_HTML, false, var(0), p_content_head_tags),
5980 5981 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
5988 5989 CommonInfo cinfo,
5989 5990 String additional_script
5990 5991 )=
  5992 + //println("to_html_ajax_content(content_HTML, cinfo, additional_script)");
  5993 + //println("additional_script"+additional_script);
5991 5994 since to_html_ajax_content(partial(content_HTML), cinfo) is html_ajax_content(html, script, js_files, css_files),
5992 5995 json_object([
5993 5996 json_member("html", json_string(html)),
... ...
web/jQuery/CXM_jquery_dialog.anubis
  Show/Hide comments   View file @b22d0e0
... ... @@ -29,19 +29,21 @@ public define HTML_Partial_Content
29 29 String extra_param
30 30 )=
31 31 with dlg_id = id(dial_id),
32   - js = js_inline(jquery_ready("
33   - $( \"#"+dlg_id+"\" ).dialog({
34   - autoOpen: "+to_String(autoOpen)+",
35   - modal: true,
36   - height: 'auto',
37   - width: 'auto',
38   - "+extra_param+"
39   - Cancel: function() {
40   - $( this ).dialog( 'close' );
41   - }
42   - });
43   - ")),
44   -
  32 + js_str =
  33 +"
  34 +$( \"#"+dlg_id+"\" ).dialog({
  35 + autoOpen: "+to_String(autoOpen)+",
  36 + modal: true,
  37 + height: 'auto',
  38 + width: 'auto',
  39 + "+extra_param+"
  40 + Cancel: function() {
  41 + $( this ).dialog( 'close' );
  42 + }
  43 + });
  44 +",
  45 + js = js_inline(jquery_ready(js_str)),
  46 +
45 47 if content is
46 48 {
47 49 p_content(pc) then
... ... @@ -51,6 +53,7 @@ public define HTML_Partial_Content
51 53 partial_content( [js], html), //html code of the dialog
52 54 ajax(_url) then
53 55 with url = format_web_action_name(_url),
  56 + //println("jq_dialog_create : \njs_str ->"+js_str+"\nurl ->"+url);
54 57 partial_content( [js], div_empty([id(dlg_id), attr("ajax_url",url)]))
55 58 }.
56 59  
... ...