Commit 6edd71c52b3216d7339106b2cb0015d921ad8895
1 parent
fabdcf5d
remove all warning during compilation
Showing
8 changed files
with
23 additions
and
24 deletions
Show diff stats
database/db_types.anubis
web/CXM_dojo.anubis
| ... | ... | @@ -824,9 +824,8 @@ public define List(HTML_Head_Tag) |
| 824 | 824 | String theme_name |
| 825 | 825 | ) |
| 826 | 826 | = |
| 827 | - with theme_name = | |
| 828 | - if file_exists(web_dir+"/public/js/dojo/dijit/themes/"+theme_name+"/"+theme_name+".css")then theme_name else "claro", | |
| 829 | - [ css(css_file("js/dojo/dijit/themes/"+theme_name+"/"+theme_name+".css")) . | |
| 830 | - [ css(css_file("js/dojo/dijit/themes/"+theme_name+"/"+theme_name+"_rtl.css")) . dojo_defaults ] | |
| 831 | - ] | |
| 827 | + with _theme_name = if file_exists(web_dir+"/public/js/dojo/dijit/themes/"+theme_name+"/"+theme_name+".css")then theme_name else "claro", | |
| 828 | + [ css(css_file("js/dojo/dijit/themes/"+_theme_name+"/"+_theme_name+".css")) . | |
| 829 | + [ css(css_file("js/dojo/dijit/themes/"+_theme_name+"/"+_theme_name+"_rtl.css")) . dojo_defaults ] | |
| 830 | + ] | |
| 832 | 831 | . | ... | ... |
web/CXM_form.anubis
| ... | ... | @@ -434,8 +434,8 @@ public define HTML_In_Form |
| 434 | 434 | map( ((WebArgValue, String) item) |-> |
| 435 | 435 | i <- *i + 1; |
| 436 | 436 | if item is (wav, item_label) then |
| 437 | - with id = if id is htmlId(the_id) then htmlId(the_id + "_radio_" + *i), | |
| 438 | - div([class(itemclass)], radio_button_r(options, item_label, id, wan, wav, | |
| 437 | + with _id = if id is htmlId(the_id) then htmlId(the_id + "_radio_" + *i), | |
| 438 | + div([class(itemclass)], radio_button_r(options, item_label, _id, wan, wav, | |
| 439 | 439 | if new_selected is success(v) then wav.value = v.value else false)), |
| 440 | 440 | items)) |
| 441 | 441 | ), |
| ... | ... | @@ -452,8 +452,8 @@ public define HTML_In_Form |
| 452 | 452 | // div([class("in")], html), |
| 453 | 453 | raw_in_form(label, id, input) then |
| 454 | 454 | sequence([ |
| 455 | - if id is htmlId(id) then | |
| 456 | - literal("<label for=\"" + id + "\">" + label + "</label>"), | |
| 455 | + if id is htmlId(_id) then | |
| 456 | + literal("<label for=\"" + _id + "\">" + label + "</label>"), | |
| 457 | 457 | input]), |
| 458 | 458 | div(options, e) then div(options, e), |
| 459 | 459 | partial(p_content) then partial(p_content), | ... | ... |
web/CXM_jquery.anubis
| ... | ... | @@ -39,8 +39,8 @@ define String |
| 39 | 39 | if options is |
| 40 | 40 | { |
| 41 | 41 | [ ] then formated_options, |
| 42 | - [ h . t ] then | |
| 43 | - if h is | |
| 42 | + [ c . t ] then | |
| 43 | + if c is | |
| 44 | 44 | { |
| 45 | 45 | resizable then jquery_button_get_onclick_action_window_options( |
| 46 | 46 | t, formated_options+ comma+ "resizable=yes" ), | ... | ... |
web/CXM_making_a_web_site.anubis
| ... | ... | @@ -4441,7 +4441,7 @@ define Printable_tree |
| 4441 | 4441 | div_empty(options) then |
| 4442 | 4442 | format(cinfo, sn, ic_v, any_div_empty(options), format_element, is_https, action_count, head_tags), |
| 4443 | 4443 | iframe(options, css_styles, css_files, js_files, body) then |
| 4444 | - if body is body(body_options,element) then | |
| 4444 | + if body is body(body_options,elem) then | |
| 4445 | 4445 | [ "<iframe", format_attrs(options), ">\n", |
| 4446 | 4446 | "<html style=\"margin: 0pt; padding: 0pt;\">\n", |
| 4447 | 4447 | "<head>\n", |
| ... | ... | @@ -4450,7 +4450,7 @@ define Printable_tree |
| 4450 | 4450 | add_js_files(js_files), |
| 4451 | 4451 | "</head>\n", |
| 4452 | 4452 | "<body ", format(body_options), ">\n", // format body options |
| 4453 | - format(cinfo,sn,ic_v,element,is_https, action_count, head_tags), | |
| 4453 | + format(cinfo,sn,ic_v,elem,is_https, action_count, head_tags), | |
| 4454 | 4454 | "</body>\n", |
| 4455 | 4455 | "</html>\n", |
| 4456 | 4456 | "</iframe>\n", | ... | ... |
web/CXM_multihost_http_server.anubis
| ... | ... | @@ -2872,14 +2872,14 @@ public define List(Web_arg) |
| 2872 | 2872 | if find_the_first(body_temp_file, __boundary, file_offset) is |
| 2873 | 2873 | { |
| 2874 | 2874 | failure then println("first boundary NOT found");[ ], |
| 2875 | - success(first) then | |
| 2876 | - with first = first + file_offset, //adjust the offset to real offset in file | |
| 2875 | + success(_first) then | |
| 2876 | + with first = _first + file_offset, //adjust the offset to real offset in file | |
| 2877 | 2877 | //get the second boundary position |
| 2878 | 2878 | if find_the_first(body_temp_file, __boundary, first + boundary_length) is |
| 2879 | 2879 | { |
| 2880 | 2880 | failure then println("last boundary NOT found");[ ], |
| 2881 | - success(last) then | |
| 2882 | - with last = last + first + boundary_length, //adjust the offset to real offset in file | |
| 2881 | + success(_last)then | |
| 2882 | + with last = _last + first + boundary_length, //adjust the offset to real offset in file | |
| 2883 | 2883 | //Extract the file content here |
| 2884 | 2884 | if get_multipart_entity(web_site_dir, body_temp_file, first+boundary_length, last, s) is |
| 2885 | 2885 | { | ... | ... |
web/CXM_web_arg_utils.anubis
web/jQuery/CXM_jquery_button.anubis
| ... | ... | @@ -281,10 +281,10 @@ public define HTML_Partial_Content |
| 281 | 281 | cancel: " + to_JS_String(dlg_cancel) + "};", |
| 282 | 282 | |
| 283 | 283 | button_name = uid, |
| 284 | - actioner = jQuery_actioner(same, jqscript, "CalexiumToolBox.make_confirm_dialog(this, " /*+ to_js_string("/?a=" + url + format_extra_operands(extra_ops))+*/ + to_JS_String(jquery_button_get_onclick_action(actioner)) + ");"), | |
| 284 | + _actioner = jQuery_actioner(same, jqscript, "CalexiumToolBox.make_confirm_dialog(this, " /*+ to_js_string("/?a=" + url + format_extra_operands(extra_ops))+*/ + to_JS_String(jquery_button_get_onclick_action(actioner)) + ");"), | |
| 285 | 285 | |
| 286 | 286 | partial_content([js(js_file("js/cxm/cxm.js")), js_inline(jquery_ready(js_data))],sequence([ |
| 287 | - partial(jquery_button(jQuery_button(button, uid, button_name, button_label, actioner, jq_icon_none, jq_icon_none))) | |
| 287 | + partial(jquery_button(jQuery_button(button, uid, button_name, button_label, _actioner, jq_icon_none, jq_icon_none))) | |
| 288 | 288 | ])). |
| 289 | 289 | |
| 290 | 290 | public define HTML_Partial_Content |
| ... | ... | @@ -309,11 +309,11 @@ public define HTML_Partial_Content |
| 309 | 309 | ok : " + to_JS_String(dlg_ok) + ", |
| 310 | 310 | cancel: " + to_JS_String(dlg_cancel) + "};", |
| 311 | 311 | |
| 312 | - button_name = uid, | |
| 313 | - actioner = jQuery_actioner(same, jqscript, "CalexiumToolBox.make_confirm_dialog(this, " + to_JS_String(jquery_button_get_onclick_action(actioner)) +");"), | |
| 312 | + _button_name = uid, | |
| 313 | + _actioner = jQuery_actioner(same, jqscript, "CalexiumToolBox.make_confirm_dialog(this, " + to_JS_String(jquery_button_get_onclick_action(actioner)) +");"), | |
| 314 | 314 | |
| 315 | 315 | partial_content([js(js_file("js/cxm/cxm.js")), js_inline(jquery_ready(js_data))],sequence([ |
| 316 | - partial(jquery_button(jquery_img_button(img_url, button_label, button_name, actioner, orientation))) | |
| 316 | + partial(jquery_button(jquery_img_button(img_url, button_label, _button_name, _actioner, orientation))) | |
| 317 | 317 | ])). |
| 318 | 318 | |
| 319 | 319 | public define HTML_Partial_Content | ... | ... |