Anubis / Xlib

Commit dd7123b83884a43fda6440c81bb70ad79919b674

Authored by totoro
1 parent 955d2c31

add management of WEB_Action_Name (no_action) in JQuery base

Showing 1 changed file with 6 additions and 3 deletions   Show diff stats
Inline Side-by-side
web/CXM_jquery.anubis
  Show/Hide comments   View file @dd7123b
@@ -77,6 +77,7 @@ public define String @@ -77,6 +77,7 @@ public define String
77 jqlink(control_action) then 77 jqlink(control_action) then
78 if control_action is 78 if control_action is
79 { 79 {
  80 + no_action then "",
80 controller_action(ctrl, action) then "document.location='/?aws_controller="+ctrl+"&aws_action="+action+"';", 81 controller_action(ctrl, action) then "document.location='/?aws_controller="+ctrl+"&aws_action="+action+"';",
81 action_name(action) then "document.location='/?aws_action="+action+"';", 82 action_name(action) then "document.location='/?aws_action="+action+"';",
82 url(url) then "document.location='"+url+"';", 83 url(url) then "document.location='"+url+"';",
@@ -91,9 +92,10 @@ public define String @@ -91,9 +92,10 @@ public define String
91 jqlink(control_action) then 92 jqlink(control_action) then
92 if control_action is 93 if control_action is
93 { 94 {
94 - controller_action(ctrl, action) then "document.location='/?aws_controller="+ctrl+"&aws_action="+action+"';",  
95 - action_name(action) then "document.location='/?aws_action="+action+"';",  
96 - url(url) then "document.location='"+url+"';", 95 + no_action then "",
  96 + controller_action(ctrl, action) then "document.location='/?aws_controller="+ctrl+"&aws_action="+action+"';",
  97 + action_name(action) then "document.location='/?aws_action="+action+"';",
  98 + url(url) then "document.location='"+url+"';",
97 } 99 }
98 jqflink(link) then "document.location='"+link+"';", 100 jqflink(link) then "document.location='"+link+"';",
99 jqscript(script) then script 101 jqscript(script) then script
@@ -105,6 +107,7 @@ public define String @@ -105,6 +107,7 @@ public define String
105 jqlink(control_action) then 107 jqlink(control_action) then
106 if control_action is 108 if control_action is
107 { 109 {
  110 + no_action then "",
108 controller_action(ctrl, action) then 111 controller_action(ctrl, action) then
109 "window.open('aws_controller="+ctrl+"&aws_action="+action+"', '"+window_name+"', '"+jquery_button_get_onclick_action_window_options(window_options, "")+"');", 112 "window.open('aws_controller="+ctrl+"&aws_action="+action+"', '"+window_name+"', '"+jquery_button_get_onclick_action_window_options(window_options, "")+"');",
110 //"document.location='/?aws_controller="+ctrl+"&aws_action="+action+"';", 113 //"document.location='/?aws_controller="+ctrl+"&aws_action="+action+"';",