diff options
| author |  Benjamin Barenblat <bbaren@mit.edu> | 2015-04-14 00:50:26 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@mit.edu> | 2015-04-14 00:50:26 -0400 |
| commit | 2721267f40e35a3a2acfa8ee332bda454823ef83 (patch) | |
| tree | fd2461d0f1474aedfc1d6585e7f7e140674562de /tests | |
| parent | 2e1bbc9749f1ad089c0fd366b74646921f35a759 (diff) | |
| parent | 6e7a226de27e3689d87c11e5c12f384fb399c499 (diff) | |
Merge branch 'upstream' into dfsg_clean20150412+dfsg
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/docevents.ur | 7 | ||||
| -rw-r--r-- | tests/dynClassB.ur | 17 | ||||
| -rw-r--r-- | tests/dynClassB.urp | 5 | ||||
| -rw-r--r-- | tests/files.urp | 2 | ||||
| -rw-r--r-- | tests/style.css | 7 |
5 files changed, 34 insertions, 4 deletions
diff --git a/tests/docevents.ur b/tests/docevents.ur index eed38868..906afa2b 100644 --- a/tests/docevents.ur +++ b/tests/docevents.ur @@ -1,6 +1,7 @@ fun main () : transaction page = return <xml> - <body onload={onDblclick (alert "Double click"); - onKeypress (fn k => alert ("Keypress: " ^ show k))}> + <body onload={onDblclick (fn _ => alert "Double click"); + onContextmenu (fn _ => alert "Context menu"); + onKeypress (fn k => alert ("Keypress: " ^ show k.KeyCode))}> Nothing here. - </body> + </body> </xml> diff --git a/tests/dynClassB.ur b/tests/dynClassB.ur new file mode 100644 index 00000000..fc7aeb43 --- /dev/null +++ b/tests/dynClassB.ur @@ -0,0 +1,17 @@ +style style1 +style style2 + +fun main () : transaction page = + toggle <- source False; + return <xml> + <head> + <link rel="stylesheet" type="text/css" href="/style.css"/> + </head> + <body dynClass={b <- signal toggle; + return (if b then style1 else style2)} + dynStyle={b <- signal toggle; + return (if b then STYLE "margin: 100px" else STYLE "")}> + Body + <button onclick={fn _ => b <- get toggle; set toggle (not b)}>TOGGLE</button> + </body> + </xml> diff --git a/tests/dynClassB.urp b/tests/dynClassB.urp new file mode 100644 index 00000000..e580b035 --- /dev/null +++ b/tests/dynClassB.urp @@ -0,0 +1,5 @@ +rewrite all DynClassB/* +file /style.css style.css +allow url /style.css + +dynClassB diff --git a/tests/files.urp b/tests/files.urp index 100992e5..3683f1a8 100644 --- a/tests/files.urp +++ b/tests/files.urp @@ -1,6 +1,6 @@ rewrite all Files/* file /hello_world.txt hello.txt file /img/web.png web.png -file /files.urp files.urp +file /files.urp ./files.urp files diff --git a/tests/style.css b/tests/style.css new file mode 100644 index 00000000..78b33fc2 --- /dev/null +++ b/tests/style.css @@ -0,0 +1,7 @@ +body.style1 { + background-color: blue; +} + +body.style2 { + background-color: green; +} |