diff --git a/web/CXM_web_action.anubis b/web/CXM_web_action.anubis index 979a813..089d99e 100644 --- a/web/CXM_web_action.anubis +++ b/web/CXM_web_action.anubis @@ -10,19 +10,6 @@ read system/string.anubis transmit xlib/web/types/web_action_name.anubis transmit xlib/web/CXM_urllib.anubis -//public type WEB_Action_Name: -// controller_action( -// String controller, -// String action_name -// ), -// action_name( -// String action_name -// ), -// //url is raw action, hence we will only copy that url in final link -// url( -// String url_name -// ) -//. public define String format_extra_operands @@ -58,7 +45,7 @@ public define String if action is { no_action then "", - controller_action(controller, action_name) then "?aws_controller="+controller+"&aws_action="+action_name, + controller_action(controller, action_name) then "?aws_c="+controller+"&aws_a="+action_name, action_name(action_name) then "?aws_action="+action_name, url(url) then url } @@ -76,6 +63,17 @@ public define String . public define String + format_web_action_name + ( + WEB_Action_Name action, + (String,String) extra_ops + )= + format_web_action_name(action) + + + format_extra_operands([extra_ops]) +. + +public define String format_web_action_name_to_js ( WEB_Action_Name action, @@ -87,6 +85,15 @@ public define String public define String format_web_action_name_to_js ( + WEB_Action_Name action, + (String,String) extra_ops, + )= + "'"+format_web_action_name(action, extra_ops)+"'" +. + +public define String + format_web_action_name_to_js + ( WEB_Action_Name action )= format_web_action_name_to_js(action, []) -- libgit2 0.21.4