1 files changed, 77 insertions, 11 deletions

diff --git a/lib/js/urweb.js b/lib/js/urweb.js
index 3bf21dd2..335cb525 100644
--- a/lib/js/urweb.js
+++ b/lib/js/urweb.js
@@ -537,6 +537,10 @@ function uw_onClick(f) {
     uw_handler("onclick", f);
 }
 
+function uw_onContextmenu(f) {
+    uw_handler("oncontextmenu", f);
+}
+
 function uw_onDblclick(f) {
     uw_handler("ondblclick", f);
 }
@@ -545,6 +549,14 @@ function uw_onMousedown(f) {
     uw_handler("onmousedown", f);
 }
 
+function uw_onMouseenter(f) {
+    uw_handler("onmouseenter", f);
+}
+
+function uw_onMouseleave(f) {
+    uw_handler("onmouseleave", f);
+}
+
 function uw_onMousemove(f) {
     uw_handler("onmousemove", f);
 }
@@ -636,21 +648,25 @@ function cr(n) {
     return closures[n];
 }
 
-function flattenAcc(a, cls, tr) {
-    if (tr.cat1 != null) {
-        flattenAcc(a, cls, tr.cat1);
-        flattenAcc(a, cls, tr.cat2);
-    } else if (tr.closure != null) {
-        var cl = newClosure(tr.closure);
-        cls.v = cons(cl, cls.v);
-        a.push("cr(", cl.toString(), ")");
-    } else
-        a.push(tr);
+function flattenAcc(a, cls, trs) {
+    while (trs) {
+        var tr = trs.data;
+        trs = trs.next;
+
+        if (tr.cat1 != null) {
+            trs = cons(tr.cat1, cons(tr.cat2, trs));
+        } else if (tr.closure != null) {
+            var cl = newClosure(tr.closure);
+            cls.v = cons(cl, cls.v);
+            a.push("cr(", cl.toString(), ")");
+        } else
+            a.push(tr);
+    }
 }
 
 function flatten(cls, tr) {
     var a = [];
-    flattenAcc(a, cls, tr);
+    flattenAcc(a, cls, cons(tr, null));
     return a.join("");
 }
 
@@ -1237,6 +1253,56 @@ function dynClass(pnode, html, s_class, s_style) {
     }
 }
 
+function bodyDynClass(s_class, s_style) {
+    if (suspendScripts)
+        return;
+
+    var htmlCls = null;
+
+    if (s_class) {
+        var x = document.createElement("script");
+        x.dead = false;
+        x.signal = s_class;
+        x.sources = null;
+        x.closures = htmlCls;
+
+        x.recreate = function(v) {
+            for (var ls = x.closures; ls != htmlCls; ls = ls.next)
+                freeClosure(ls.data);
+
+            var cls = {v : null};
+            document.body.className = flatten(cls, v);
+            console.log("className to + " + document.body.className);
+	    x.closures = concat(cls.v, htmlCls);
+        }
+
+        document.body.appendChild(x);
+        populate(x);
+    }
+
+    if (s_style) {
+        var htmlCls2 = s_class ? null : htmlCls;
+        var y = document.createElement("script");
+        y.dead = false;
+        y.signal = s_style;
+        y.sources = null;
+        y.closures = htmlCls2;
+
+        y.recreate = function(v) {
+            for (var ls = y.closures; ls != htmlCls2; ls = ls.next)
+                freeClosure(ls.data);
+
+            var cls = {v : null};
+            document.body.style.cssText = flatten(cls, v);
+            console.log("style to + " + document.body.style.cssText);
+	    y.closures = concat(cls.v, htmlCls2);
+        }
+
+        document.body.appendChild(y);
+        populate(y);
+    }
+}
+
 function addOnChange(x, f) {
     var old = x.onchange;
     if (old == null)