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

comparison lib/js/urweb.js @ 1802:e3ec868567ce

Undo change to script evaluation, originally made to support <active> + 'giveFocus'; alternate approach to making 'giveFocus' work in dynamic code generatione

author	Adam Chlipala <adam@chlipala.net>
date	Fri, 03 Aug 2012 08:38:47 -0400
parents	10a2cb93d175
children	d2383ffc18ab

comparison

equal deleted inserted replaced

-:5c51ae0d643b
+:e3ec868567ce
 if (pnode == "table") {
 normalizeTable(x.parentNode);
 var dummy = document.createElement("body");
 dummy.innerHTML = "<table>" + html + "</table>";
+runScripts(dummy);
 var table = x.parentNode;
 if (table) {
 firstChild = null;
 var tbody;
 firstChild = document.createElement("script");
 table.insertBefore(firstChild, x);
 for (var node = tbody.firstChild; node; node = next) {
 next = node.nextSibling;
 table.insertBefore(node, x);
-runScripts(node);
 }
 }
 } else if (pnode == "tr") {
 var dummy = document.createElement("body");
 dummy.innerHTML = "<table><tr>" + html + "</tr></table>";
+runScripts(dummy);
 var table = x.parentNode;
 if (table) {
 var arr = dummy.getElementsByTagName("tr");
 firstChild = null;
 firstChild = document.createElement("script");
 table.insertBefore(firstChild, x);
 for (var node = tr.firstChild; node; node = next) {
 next = node.nextSibling;
 table.insertBefore(node, x);
-runScripts(node);
 }
 }
 } else {
 firstChild = document.createElement("span");
 firstChild.innerHTML = html;
+runScripts(firstChild);
 if (x.parentNode)
 x.parentNode.insertBefore(firstChild, x);
-runScripts(firstChild);
 }
 };
 addNode(x);
 populate(x);
 function fresh() {
 return "uw" + (--nextId);
 }
 function giveFocus(id) {
-var node = document.getElementById(id);
+window.setTimeout(function() {
+var node = document.getElementById(id);
-if (node)
-node.focus();
+if (node)
-else
+node.focus();
-er("Tried to give focus to ID not used in document: " + id);
+else
+er("Tried to give focus to ID not used in document: " + id);
+}, 0);
 }
 // App-specific code