Ur/Web: lib/js/urweb.js comparison

comparison lib/js/urweb.js @ 899:25a038a9194b

dtable example and demos both working

author	Adam Chlipala <adamc@hcoop.net>
date	Thu, 06 Aug 2009 11:54:28 -0400
parents	d1d0b18afd3d
children	ed381288ce9a

comparison

equal deleted inserted replaced

-:d1d0b18afd3d
+:25a038a9194b
 function parent() {
 return thisScript ? thisScript.parentNode : lastParent();
 }
 function addNode(node) {
-if (thisScript) {
+if (thisScript)
-thisScript.parentNode.appendChild(node);
+thisScript.parentNode.replaceChild(node, thisScript);
-thisScript.parentNode.removeChild(thisScript);
+else
-} else {
 lastParent().appendChild(node);
 }
-}
-function setHTML(html) {
-var x = document.createElement("span");
-x.dead = false;
-x.signal = null;
-x.sources = null;
-x.closures = null;
-x.innerHTML = html;
-addNode(x);
-runScripts(x);
-}
 var thisScript = null;
 function runScripts(node) {
-var savedScript = thisScript;
+if (node.getElementsByTagName) {
+var savedScript = thisScript;
-var scripts = node.getElementsByTagName("script"), scriptsCopy = [];
-var len = scripts.length;
+var scripts = node.getElementsByTagName("script"), scriptsCopy = [];
-for (var i = 0; i < len; ++i)
+var len = scripts.length;
-scriptsCopy[i] = scripts[i];
+for (var i = 0; i < len; ++i)
-for (var i = 0; i < len; ++i) {
+scriptsCopy[i] = scripts[i];
-thisScript = scriptsCopy[i];
+for (var i = 0; i < len; ++i) {
-try {
+thisScript = scriptsCopy[i];
-eval(thisScript.textContent);
+try {
-} catch (v) {
+eval(thisScript.textContent);
-doExn(v);
+} catch (v) {
+doExn(v);
+}
+if (thisScript.parentNode)
+thisScripts.parentNode.removeChild(thisScript);
 }
-}
+thisScript = savedScript;
-thisScript = savedScript;
+}
 }
 // Dynamic tree entry points
 function dyn(s) {
-var x = parent();
+var x = document.createElement("div");
+x.style.display = "inline";
 x.dead = false;
 x.signal = s;
 x.sources = null;
 x.closures = null;
+var first = null;
 x.recreate = function(v) {
 for (var ls = x.closures; ls; ls = ls.next)
 freeClosure(ls.data);
-var doKind = function(kind) {
+for (var node = first; node && node != x; ) {
-var arr = x.getElementsByTagName(kind);
+if (node.getElementsByTagName) {
-for (var i = 0; i < arr.length; ++i) {
+var arr = node.getElementsByTagName("div");
-var span = arr[i];
+for (var i = 0; i < arr.length; ++i) {
-span.dead = true;
+var span = arr[i];
-for (var ls = span.sources; ls; ls = ls.next)
+span.dead = true;
-ls.data.dyns = remove(span, ls.data.dyns);
+for (var ls = span.sources; ls; ls = ls.next)
-for (var ls = span.closures; ls; ls = ls.next)
+ls.data.dyns = remove(span, ls.data.dyns);
-freeClosure(ls.data);
+for (var ls = span.closures; ls; ls = ls.next)
+freeClosure(ls.data);
+}
 }
-};
+var old = node;
-doKind("span");
+node = node.nextSibling;
-doKind("tbody");
+old.parentNode.removeChild(old);
+}
 var cls = {v : null};
-x.innerHTML = flatten(cls, v);
+var dummy = document.createElement("table");
+dummy.innerHTML = flatten(cls, v);
 x.closures = cls.v;
-runScripts(x);
+runScripts(dummy);
+for (first = dummy.firstChild; first && first.tagName == "TBODY"; first = first.firstChild);
+for (var node = first; node; ) {
+var old = node;
+node = node.nextSibling;
+x.parentNode.insertBefore(old, x);
+}
 };
+addNode(x);
 populate(x);
 }
 function input(t, s, recreate) {
 var x = document.createElement(t);
 x.dead = false;
 x.signal = ss(s);
 x.sources = null;
 x.recreate = recreate(x);
+addNode(x);
 populate(x);
-addNode(x);
 return x;
 }
 function inp(s) {
 x.innerHTML = content;
 x.value = s.data;
 if (x.value != s.data)
 sv(s, x.value);
 x.onchange = function() { sv(s, x.value) };
 return x;
 }
 function chk(s) {