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

comparison lib/js/urweb.js @ 1039:8932f855fa85

grid0 working in IE

author	Adam Chlipala <adamc@hcoop.net>
date	Sun, 22 Nov 2009 15:30:15 -0500
parents	dcc6093e9575
children	ca5136105c45

comparison

equal deleted inserted replaced

-:dcc6093e9575
+:8932f855fa85
 failHandlers = cons(f, failHandlers);
 }
 function doExn(v) {
 if (v == null || v.uw_error == null) {
-var s = (v == null ? "null" : v.toString());
+var s = (v == null ? "null" : v.message ? v.message : v.toString());
 if (v != null && v.fileName && v.lineNumber)
 s += " (" + v.fileName + ":" + v.lineNumber + ")";
 runHandlers("Fail", failHandlers, s);
 }
 }
 var pos = document;
 while (pos.lastChild && pos.lastChild.nodeType == 1)
 pos = pos.lastChild;
-return pos.parentNode;
+pos = pos.parentNode;
+return pos;
 }
 function parent() {
 return thisScript ? thisScript.parentNode : lastParent();
 }
 var len = scripts.length;
 for (var i = 0; i < len; ++i)
 scriptsCopy[i] = scripts[i];
 for (var i = 0; i < len; ++i) {
 thisScript = scriptsCopy[i];
 try {
 eval(thisScript.text);
 } catch (v) {
 doExn(v);
 }
 freeClosure(ls.data);
 var next;
 for (var child = firstChild; child && child != x; child = next) {
 next = child.nextSibling;
 killScript(child);
 if (child.getElementsByTagName) {
 var arr = child.getElementsByTagName("script");
 for (var i = 0; i < arr.length; ++i)
 killScript(arr[i]);
 if (child.parentNode)
 child.parentNode.removeChild(child);
 }
 var cls = {v : null};
-var html = dynPrefix + flatten(cls, v);
+var html = flatten(cls, v);
+if (pnode != "table" && pnode != "tr")
+html = dynPrefix + html;
 x.closures = cls.v;
 if (pnode == "table") {
 var dummy = document.createElement("body");
 dummy.innerHTML = "<table>" + html + "</table>";
 runScripts(dummy);
 var table = x.parentNode;
 if (table) {
-var arr = dummy.getElementsByTagName("tbody");
 firstChild = null;
 var tbody;
-if (arr.length > 0 && table != null)
+var arr = dummy.getElementsByTagName("tbody");
+var tbody;
+if (arr.length > 0 && arr[0].parentNode == dummy.firstChild) {
 tbody = arr[0];
-else
+var next;
+for (var node = dummy.firstChild.firstChild; node; node = next) {
+next = node.nextSibling;
+if (node.tagName != "TBODY")
+tbody.appendChild(node);
+}
+} else
 tbody = dummy.firstChild;
 var next;
 firstChild = document.createElement("script");
 table.insertBefore(firstChild, x);
 var table = x.parentNode;
 if (table) {
 var arr = dummy.getElementsByTagName("tr");
 firstChild = null;
-var tbody;
+var tr;
 if (arr.length > 0 && table != null)
-tbody = arr[0];
+tr = arr[0];
 else
-tbody = dummy.firstChild;
+tr = dummy.firstChild;
 var next;
 firstChild = document.createElement("script");
 table.insertBefore(firstChild, x);
-for (var node = tbody.firstChild; node; node = next) {
+for (var node = tr.firstChild; node; node = next) {
 next = node.nextSibling;
 table.insertBefore(node, x);
 }
 }
 } else {
 addNode(x);
 populate(x);
 }
-function input(t, s, recreate) {
+function input(t, s, recreate, type) {
 var x = document.createElement(t);
+if (type) x.type = type;
 x.dead = false;
 x.signal = ss(s);
 x.sources = null;
 x.recreate = recreate(x);
 addNode(x);
 return x;
 }
 function chk(s) {
-var x = input("input", s, function(x) { return function(v) { if (x.checked != v) x.checked = v; }; });
+var x = input("input", s, function(x) { return function(v) { if (x.checked != v) x.checked = v; }; }, "checkbox");
-x.type = "checkbox";
 x.checked = s.data;
 x.onchange = function() { sv(s, x.checked) };
 return x;
 }