webmcp
changeset 534:efc700d98c17
Removed attr support for value container but kept bugfix from changeset a2ff42a662125a5c6b958f1c6a210382fe712308
author | jbe |
---|---|
date | Mon Apr 01 23:35:29 2019 +0200 (2019-04-01) |
parents | b316f1c894ae |
children | 8ebbc33ee84d |
files | framework/env/ui/container.lua |
line diff
1.1 --- a/framework/env/ui/container.lua Mon Apr 01 19:16:39 2019 +0200 1.2 +++ b/framework/env/ui/container.lua Mon Apr 01 23:35:29 2019 +0200 1.3 @@ -18,7 +18,7 @@ 1.4 --]]-- 1.5 1.6 function ui.container(args) 1.7 - local attr, label, label_attr, legend, legend_attr, value_container_attr, content 1.8 + local attr, label, label_attr, legend, legend_attr, content 1.9 local auto_args = args.auto_args 1.10 if auto_args then 1.11 attr = auto_args.container_attr 1.12 @@ -26,7 +26,6 @@ 1.13 label_attr = auto_args.label_attr 1.14 legend = auto_args.legend 1.15 legend_attr = auto_args.legend_attr 1.16 - value_container_attr = auto_args.value_container_attr 1.17 if label and auto_args.attr and auto_args.attr.id then 1.18 label_attr = table.new(label_attr) 1.19 label_attr["for"] = auto_args.attr.id 1.20 @@ -53,14 +52,7 @@ 1.21 slot.put(" ") 1.22 end 1.23 if type(content) == "function" then 1.24 - if value_container_attr then 1.25 - ui.container{ 1.26 - attr = value_container_attr, 1.27 - content = content 1.28 - } 1.29 - else 1.30 - content() 1.31 - end 1.32 + content() 1.33 elseif content then 1.34 slot.put(encode.html(content)) 1.35 end