# HG changeset patch # User Adam Chlipala # Date 1342919235 14400 # Node ID 2e01a36701ebd03246d263f46a7ba06f956ac6a3 # Parent f57983ba2a36f955a4f71666d58a134e57d934a5 Fix bug in handling of event attributes within client-side widgets diff -r f57983ba2a36 -r 2e01a36701eb src/monoize.sml --- a/src/monoize.sml Sat Jul 21 15:34:07 2012 -0400 +++ b/src/monoize.sml Sat Jul 21 21:07:15 2012 -0400 @@ -3441,10 +3441,21 @@ | (x, e, _) => if String.isPrefix "On" x then let + val arg = if String.isPrefix "Onkey" x then + SOME (L'.EFfiApp ("Basis", "keyEvent", []), loc) + else if String.isSuffix "click" x orelse String.isPrefix "Onmouse" x then + SOME (L'.EFfiApp ("Basis", "mouseEvent", []), loc) + else + NONE + + val e = liftExpInExp 0 e + + val e = case arg of + NONE => e + | SOME arg => (L'.EApp (e, arg), loc) + val e = (L'.EAbs ("_", (L'.TRecord [], loc), (L'.TRecord [], loc), - (L'.EApp ((L'.EApp (liftExpInExp 0 e, - (L'.EFfiApp ("Basis", "kc", []), loc)), - loc), (L'.ERecord [], loc)), loc)), loc) + (L'.EApp (e, (L'.ERecord [], loc)), loc)), loc) in case x of "Onkeyup" => diff -r f57983ba2a36 -r 2e01a36701eb tests/ctextboxAttrs.ur --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/ctextboxAttrs.ur Sat Jul 21 21:07:15 2012 -0400 @@ -0,0 +1,6 @@ +fun main () : transaction page = + s <- source "Initial"; + return + alert ("Clicky " ^ show ev.ScreenX)} + onkeypress={fn ev => alert ("Code " ^ show ev.KeyCode)}/> +