diff options
author | Benjamin Barenblat <bbaren@mit.edu> | 2017-01-07 08:38:35 -0500 |
---|---|---|
committer | Benjamin Barenblat <bbaren@mit.edu> | 2017-01-07 08:38:35 -0500 |
commit | 6145d9df05f442e29dfa96a0b8e15ffcc2d683dd (patch) | |
tree | 447639a278556e40c0f7a5784ba4b645f80c1187 /lib/ur/basis.urs | |
parent | 235602373c04aa38b7f8c93e6efbd9276ecc2266 (diff) | |
parent | 4bbdbbc72d96567f8c5a1d435beef32d447dec30 (diff) |
Merge branch 'upstream' into dfsg_clean20170105+dfsg
Diffstat (limited to 'lib/ur/basis.urs')
-rw-r--r-- | lib/ur/basis.urs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/ur/basis.urs b/lib/ur/basis.urs index 8b0d4faa..23896e27 100644 --- a/lib/ur/basis.urs +++ b/lib/ur/basis.urs @@ -947,7 +947,8 @@ val img : bodyTag ([Alt = string, Src = url, Width = int, Height = int, val form : ctx ::: {Unit} -> bind ::: {Type} -> [[MakeForm, Form] ~ ctx] => - option css_class + option id + -> option css_class -> xml ([Form] ++ ctx) [] bind -> xml ([MakeForm] ++ ctx) [] [] @@ -981,7 +982,7 @@ val hidden : formTag string [] [Data = data_attr, Id = string, Value = string] val textbox : formTag string [] ([Value = string, Size = int, Placeholder = string, Source = source string, Onchange = transaction unit, Ontext = transaction unit] ++ boxAttrs ++ inputAttrs) val password : formTag string [] ([Value = string, Size = int, Placeholder = string, Onchange = transaction unit] ++ boxAttrs ++ inputAttrs) -val textarea : formTag string [] ([Rows = int, Cols = int, Onchange = transaction unit, +val textarea : formTag string [] ([Rows = int, Cols = int, Placeholder = string, Onchange = transaction unit, Ontext = transaction unit] ++ boxAttrs ++ inputAttrs) val checkbox : formTag bool [] ([Checked = bool, Onchange = transaction unit] ++ boxAttrs) @@ -1091,7 +1092,7 @@ val ccheckbox : cformTag ([Size = int, Source = source bool, Onchange = transact val cselect : cformTag ([Source = source string, Onchange = transaction unit] ++ boxAttrs) [Cselect] val coption : unit -> tag [Value = string, Selected = bool] [Cselect, Body] [] [] [] -val ctextarea : cformTag ([Rows = int, Cols = int, Source = source string, Onchange = transaction unit, +val ctextarea : cformTag ([Rows = int, Cols = int, Placeholder = string, Source = source string, Onchange = transaction unit, Ontext = transaction unit] ++ boxAttrs ++ inputAttrs) [] (*** Tables *) |