Anubis / Xlib

Commit e9e9c5224885e9a523102f6226c13effb96fab05

Authored by totoro
1 parent bd13c388

add '&' to the result of format_extra_operands or return "" if the extra operand doesn't exist

Showing 3 changed files with 10 additions and 9 deletions   Show diff stats
Inline Side-by-side
web/CXM_jquery.anubis
  Show/Hide comments   View file @e9e9c52
@@ -92,7 +92,7 @@ public define String @@ -92,7 +92,7 @@ public define String
92 if control_action is 92 if control_action is
93 { 93 {
94 no_action then "", 94 no_action then "",
95 - controller_action(ctrl, action) then "document.location='/?aws_controller="+ctrl+"&aws_action="+action+format_extra_operands(extra_ops)+"';", 95 + controller_action(ctrl, action) then "document.location='/?aws_controller="+ctrl+"&aws_action="+action+format_extra_operands(extra_ops)+"';",
96 action_name(action) then "document.location='/?aws_action="+action+"';", 96 action_name(action) then "document.location='/?aws_action="+action+"';",
97 url(url) then "document.location='"+url+"';", 97 url(url) then "document.location='"+url+"';",
98 } 98 }
@@ -118,7 +118,7 @@ public define String @@ -118,7 +118,7 @@ public define String
118 if control_action is 118 if control_action is
119 { 119 {
120 no_action then "", 120 no_action then "",
121 - controller_action(ctrl, action) then "document.location='/?aws_controller="+ctrl+"&aws_action="+action+format_extra_operands(extra_ops)+"';", 121 + controller_action(ctrl, action) then "document.location='/?aws_controller="+ctrl+"&aws_action="+action+format_extra_operands(extra_ops)+"';",
122 action_name(action) then "document.location='/?aws_action="+action+format_extra_operands(extra_ops)+"';", 122 action_name(action) then "document.location='/?aws_action="+action+format_extra_operands(extra_ops)+"';",
123 url(url) then "document.location='"+url+"';", 123 url(url) then "document.location='"+url+"';",
124 } 124 }
@@ -145,7 +145,7 @@ public define String @@ -145,7 +145,7 @@ public define String
145 { 145 {
146 no_action then "", 146 no_action then "",
147 controller_action(ctrl, action) then 147 controller_action(ctrl, action) then
148 - "window.open('aws_controller="+ctrl+"&aws_action="+action+format_extra_operands(extra_ops)+"', '"+window_name+"', '"+jquery_button_get_onclick_action_window_options(window_options, "")+"');", 148 + "window.open('aws_controller="+ctrl+"&aws_action="+action+format_extra_operands(extra_ops)+"', '"+window_name+"', '"+jquery_button_get_onclick_action_window_options(window_options, "")+"');",
149 //"document.location='/?aws_controller="+ctrl+"&aws_action="+action+"';", 149 //"document.location='/?aws_controller="+ctrl+"&aws_action="+action+"';",
150 action_name(action) then 150 action_name(action) then
151 "window.open('"+action+format_extra_operands(extra_ops)+"', '"+window_name+"', '"+jquery_button_get_onclick_action_window_options(window_options, "")+"');", 151 "window.open('"+action+format_extra_operands(extra_ops)+"', '"+window_name+"', '"+jquery_button_get_onclick_action_window_options(window_options, "")+"');",
web/CXM_making_a_web_site.anubis
  Show/Hide comments   View file @e9e9c52
@@ -4873,7 +4873,7 @@ define Printable_tree @@ -4873,7 +4873,7 @@ define Printable_tree
4873 { 4873 {
4874 failure then [ ] 4874 failure then [ ]
4875 success(a) then if a is (an,args) then 4875 success(a) then if a is (an,args) then
4876 - ["&a=",an,format_extra_operands(args)] 4876 + ["&a=",an,format_extra_operands(args)]
4877 }, 4877 },
4878 "\">", 4878 "\">",
4879 name, 4879 name,
@@ -5599,6 +5599,7 @@ define Printable_tree @@ -5599,6 +5599,7 @@ define Printable_tree
5599 private_download(url,name,extra,action) then 5599 private_download(url,name,extra,action) then
5600 format(cinfo,ic_v,any_private_download(url,name,extra,action),format_element,is_https, action_count, head_tags), 5600 format(cinfo,ic_v,any_private_download(url,name,extra,action),format_element,is_https, action_count, head_tags),
5601 text_input(options, label_text, id, name, i, w) then 5601 text_input(options, label_text, id, name, i, w) then
  5602 +
5602 [ format_label(label_text, id), 5603 [ format_label(label_text, id),
5603 "<input type=\"text\" name=\"",name,"\" id=\"",id,"\" size=\"",w,"\" value=\"",i,"\"",format_attrs([class("in") . options])," />"], 5604 "<input type=\"text\" name=\"",name,"\" id=\"",id,"\" size=\"",w,"\" value=\"",i,"\"",format_attrs([class("in") . options])," />"],
5604 text_input_ro(options, label_text, id, name,i,w) then 5605 text_input_ro(options, label_text, id, name,i,w) then
web/CXM_web_action.anubis
  Show/Hide comments   View file @e9e9c52
@@ -28,7 +28,10 @@ public define String @@ -28,7 +28,10 @@ public define String
28 ( 28 (
29 List((String,String)) l_args 29 List((String,String)) l_args
30 ) = 30 ) =
31 - join("&", map(((String, String) arg) |-> since arg is (name, value), name+"="+value, l_args)) 31 + if length(l_args) = 0 then
  32 + ""
  33 + else
  34 + "&"+join("&", map(((String, String) arg) |-> since arg is (name, value), name+"="+value, l_args))
32 . 35 .
33 36
34 public define String 37 public define String
@@ -68,8 +71,5 @@ public define String @@ -68,8 +71,5 @@ public define String
68 )= 71 )=
69 format_web_action_name(action) 72 format_web_action_name(action)
70 + 73 +
71 - if length(extra_ops) = 0 then  
72 - ""  
73 - else  
74 - "&"+format_extra_operands(extra_ops) 74 + format_extra_operands(extra_ops)
75 . 75 .