Mercurial > urweb
changeset 2075:fde864eacd47
Make 'required' and 'autofocus' attributes Boolean; add a syntax extension for parsing their usual HTML syntax
author | Adam Chlipala <adam@chlipala.net> |
---|---|
date | Sun, 16 Nov 2014 14:02:17 -0500 |
parents | e48e09a1f583 |
children | 855d7746a084 |
files | doc/manual.tex lib/ur/basis.urs src/urweb.grm tests/html5_forms.ur tests/html5_forms.urs |
diffstat | 5 files changed, 23 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/manual.tex Sun Oct 12 10:03:36 2014 +0000 +++ b/doc/manual.tex Sun Nov 16 14:02:17 2014 -0500 @@ -2348,13 +2348,15 @@ &&& \texttt{<}g\texttt{>}l^*\texttt{</}x\texttt{>} & \textrm{tag with children} \\ &&& \{e\} & \textrm{computed XML fragment} \\ &&& \{[e]\} & \textrm{injection of an Ur expression, via the $\mt{Top}.\mt{txt}$ function} \\ - \textrm{Tag} & g &::=& h \; (x = v)^* \\ + \textrm{Tag} & g &::=& h \; (x [= v])^* \\ \textrm{Tag head} & h &::=& x & \textrm{tag name} \\ &&& h\{c\} & \textrm{constructor parameter} \\ \textrm{Attribute value} & v &::=& \ell & \textrm{literal value} \\ &&& \{e\} & \textrm{computed value} \\ \end{array}$$ +When the optional $= v$ is omitted in an XML attribute, the attribute is assigned value $\mt{True}$ in Ur/Web, and it is rendered to HTML merely as including the attribute name without a value. If such a Boolean attribute is manually set to value $\mt{False}$, then it is omitted altogether in generating HTML. + Further, there is a special convenience and compatibility form for setting CSS classes of tags. If a \cd{class} attribute has a value that is a string literal, the literal is parsed in the usual HTML way and replaced with calls to appropriate Ur/Web combinators. Any dashes in the text are replaced with underscores to determine Ur identifiers. The same desugaring can be accessed in a normal expression context by calling the pseudo-function \cd{CLASS} on a string literal. Similar support is provided for \cd{style} attributes. Normal CSS syntax may be used in string literals that are \cd{style} attribute values, and the desugaring may be accessed elsewhere with the pseudo-function \cd{STYLE}.
--- a/lib/ur/basis.urs Sun Oct 12 10:03:36 2014 +0000 +++ b/lib/ur/basis.urs Sun Nov 16 14:02:17 2014 -0500 @@ -949,7 +949,7 @@ nm :: Name -> unit -> tag attrs ([Form] ++ ctx) inner [] [nm = ty] -con inputAttrs = [Required = string, Autofocus = string] +con inputAttrs = [Required = bool, Autofocus = bool] val hidden : formTag string [] [Data = data_attr, Id = string, Value = string]
--- a/src/urweb.grm Sun Oct 12 10:03:36 2014 +0000 +++ b/src/urweb.grm Sun Nov 16 14:02:17 2014 -0500 @@ -1747,6 +1747,12 @@ else attrv) end) + | SYMBOL (let + val loc = s (SYMBOLleft, SYMBOLright) + in + Normal ((CName (makeAttr SYMBOL), loc), + (EVar (["Basis"], "True", Infer), loc)) + end) attrv : INT (EPrim (Prim.Int INT), s (INTleft, INTright)) | FLOAT (EPrim (Prim.Float FLOAT), s (FLOATleft, FLOATright))
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/html5_forms.ur Sun Nov 16 14:02:17 2014 -0500 @@ -0,0 +1,12 @@ +fun handler r = return <xml><body> +</body></xml> + +fun main () = + return <xml><body> + <form> + <textbox{#A} required placeholder="bobby"/> + <textbox{#B} placeholder="soggy" autofocus/> + + <submit action={handler}/> + </form> + </body></xml>