From 055806ac4c6bb573aa9684fad921e231135c6e3a Mon Sep 17 00:00:00 2001 From: totoro Date: Mon, 15 Feb 2021 14:24:09 +0900 Subject: [PATCH] continue to migrate to Xlib and change the folder for js and css files --- view/view_table_renderer.anubis | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/view/view_table_renderer.anubis b/view/view_table_renderer.anubis index 5116e50..451820d 100644 --- a/view/view_table_renderer.anubis +++ b/view/view_table_renderer.anubis @@ -734,7 +734,7 @@ public define List(CXM_Form_Field) //Get the priority of the web argument content for the value, this means the value already set by the user or called with programmaticaly with it with value = get_DB_id(lwa, c_name, _value), //create refresh function and call it first to construct the dropdown - with load_script = script("text/javascript","function "+refresh_func+"() { CalexiumToolBox.ajax_load_content('"+uid+foreign_table_name+"_"+c_name+"_selector', '?aws_controller=hk_c&aws_action=selector&table_name="+foreign_table_name+"&fk_filter="+fk_clause+"&selected="+value+"&"+to_Web_arg(table_referer, "")+"');} "+refresh_func+"(); "), + with load_script = script("text/javascript","function "+refresh_func+"() { Xlib.load_content('"+uid+foreign_table_name+"_"+c_name+"_selector', '?aws_controller=hk_c&aws_action=selector&table_name="+foreign_table_name+"&fk_filter="+fk_clause+"&selected="+value+"&"+to_Web_arg(table_referer, "")+"');} "+refresh_func+"(); "), [ partial(jq_dialog_create(dialog_id(uid+foreign_table_name+"_dlg_ajax"), ajax(controller_action("hk_c", "ajax_edit_table&dialog_id="+uid+foreign_table_name+"_dlg_ajax&sub_dialog=true&table_name="+foreign_table_name+"&after_close_cb="+refresh_func)))), one_line_fields([ @@ -865,8 +865,8 @@ public define HTML_Partial_Content with form_id = dialog_id+"_form", //println("renderer_edit_list_form dialog_id ["+dialog_id+"]"); partial_content( - [ js(js_file("js/jscolor.min.js")), - js(js_file("js/dropzone.js")), + [ js(js_file("hayamiki/js/jscolor.min.js")), + js(js_file("xlib/js/dropzone.js")), js_inline(jquery_ready("Dropzone.options.myAwesomeDropzone = { maxFiles: 100, dictDefaultMessage : \""+_T("DROP_FILE_HERE")+"\", @@ -987,8 +987,8 @@ public define List(CXM_Form_Field) with uid = "_"+generate_random_string(20)+"_", with refresh_func = uid+foreign_table_name+"_"+c_name+"_selector_refresh", with value = get_DB_id(lwa, c_name, _value), - //with load_script = "CalexiumToolBox.ajax_load_content('"+uid+foreign_table_name+"_"+c_name+"_selector', '?aws_controller=hk_c&aws_action=selector&table_name="+foreign_table_name+"&fk_filter="+fk_clause+"&selected="+value+"');", - with load_script = script("text/javascript","function "+refresh_func+"() { CalexiumToolBox.ajax_load_content('"+uid+foreign_table_name+"_"+c_name+"_selector', '?aws_controller=hk_c&aws_action=selector&table_name="+foreign_table_name+"&fk_filter="+fk_clause+"&selected="+value+"');} "+refresh_func+"(); "), + //with load_script = "Xlib.load_content('"+uid+foreign_table_name+"_"+c_name+"_selector', '?aws_controller=hk_c&aws_action=selector&table_name="+foreign_table_name+"&fk_filter="+fk_clause+"&selected="+value+"');", + with load_script = script("text/javascript","function "+refresh_func+"() { Xlib.load_content('"+uid+foreign_table_name+"_"+c_name+"_selector', '?aws_controller=hk_c&aws_action=selector&table_name="+foreign_table_name+"&fk_filter="+fk_clause+"&selected="+value+"');} "+refresh_func+"(); "), [ partial(jq_dialog_create(dialog_id(uid+foreign_table_name+"_dlg_ajax"), ajax(controller_action("hk_c", "ajax_edit_table&dialog_id="+uid+foreign_table_name+"_dlg_ajax&sub_dialog=true&table_name="+foreign_table_name)))), one_line_fields([ -- libgit2 0.21.4