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

comparison lib/js/urweb.js @ 1803:d2383ffc18ab

Back out last change and pursue a different fix, based on explicitly aborting script execution at times when we don't expect scripts to run

author	Adam Chlipala <adam@chlipala.net>
date	Fri, 03 Aug 2012 12:39:04 -0400
parents	e3ec868567ce
children	9913c81bdbef

comparison

equal deleted inserted replaced

-:e3ec868567ce
+:d2383ffc18ab
 pos = pos.parentNode;
 return pos;
 }
+var thisScript = null;
 function parent() {
 return thisScript ? thisScript.parentNode : lastParent();
 }
 function addNode(node) {
 thisScript.parentNode.replaceChild(node, thisScript);
 } else
 lastParent().appendChild(node);
 }
-var thisScript = null;
 function runScripts(node) {
-if (node.getElementsByTagName) {
+if (node.tagName == "SCRIPT") {
+var savedScript = thisScript;
+thisScript = node;
+try {
+eval(thisScript.text);
+} catch (v) {
+doExn(v);
+}
+if (thisScript.parentNode)
+thisScript.parentNode.removeChild(thisScript);
+thisScript = savedScript;
+} else if (node.getElementsByTagName) {
 var savedScript = thisScript;
 var scripts = node.getElementsByTagName("script"), scriptsCopy = [];
 var len = scripts.length;
 for (var i = 0; i < len; ++i)
 function normalizeTable(table) {
 var orig = table;
 var script, next;
-while (table.tagName != "TABLE")
+while (table && table.tagName != "TABLE")
 table = table.parentNode;
 for (var tbody = table.firstChild; tbody; tbody = tbody.nextSibling) {
 if (tbody.tagName == "TBODY") {
 var firstChild = tbody.firstChild;
 tbody.appendChild(script);
 }
 table.appendChild(tbody);
 }
+var suspendScripts = false;
 function dyn(pnode, s) {
+if (suspendScripts)
+return;
 var x = document.createElement("script");
 x.dead = false;
 x.signal = s;
 x.sources = null;
 x.closures = null;
 if (pnode == "table") {
 normalizeTable(x.parentNode);
 var dummy = document.createElement("body");
-dummy.innerHTML = "<table>" + html + "</table>";
+suspendScripts = true;
-runScripts(dummy);
+try {
+dummy.innerHTML = "<table>" + html + "</table>";
+} catch (e) {
+suspendScripts = false;
+throw e;
+}
 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);
+suspendScripts = false;
+runScripts(node);
+suspendScripts = true;
 }
 }
+suspendScripts = false;
 } else if (pnode == "tr") {
 var dummy = document.createElement("body");
-dummy.innerHTML = "<table><tr>" + html + "</tr></table>";
+suspendScripts = true;
-runScripts(dummy);
+try {
+dummy.innerHTML = "<table><tr>" + html + "</tr></table>";
+} catch (e) {
+suspendScripts = false;
+throw e;
+}
 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);
+suspendScripts = false;
+runScripts(node);
+suspendScripts = true;
 }
-}
+};
+suspendScripts = false;
 } else {
 firstChild = document.createElement("span");
-firstChild.innerHTML = html;
+suspendScripts = true;
+try {
+firstChild.innerHTML = html;
+if (x.parentNode)
+x.parentNode.insertBefore(firstChild, x);
+} catch (e) {
+suspendScripts = false;
+throw e;
+}
+suspendScripts = false;
 runScripts(firstChild);
-if (x.parentNode)
-x.parentNode.insertBefore(firstChild, x);
 }
 };
 addNode(x);
 populate(x);
 }
 var cls = {v : null};
 var html = flatten(cls, html);
 x.closures = cls.v;
+suspendScripts = true;
 node.innerHTML = html;
+suspendScripts = false;
 runScripts(node);
 }
 var maySuspend = true;
 function active(s) {
+if (suspendScripts)
+return;
 var span = document.createElement("span");
 addNode(span);
 var ms = maySuspend;
 maySuspend = false;
 try {
 return x;
 }
 function inp(s, name) {
+if (suspendScripts)
+return;
 var x = input(document.createElement("input"), s,
 function(x) { return function(v) { if (x.value != v) x.value = v; }; }, null, name);
 x.value = s.data;
 x.onkeyup = x.oninput = x.onchange = x.onpropertychange = function() { sv(s, x.value) };
 }
 }
 }
 function sel(s, content) {
+if (suspendScripts)
+return;
 var dummy = document.createElement("span");
 dummy.innerHTML = "<select>" + content + "</select>";
 var x = input(dummy.firstChild, s, function(x) { return function(v) { if (selectValue(x) != v) setSelectValue(x, v); }; });
 for (var i = 0; i < x.options.length; ++i) {
 return x;
 }
 function chk(s) {
+if (suspendScripts)
+return;
 var x = input(document.createElement("input"), s,
 function(x) { return function(v) { if (x.checked != v) x.checked = v; }; }, "checkbox");
 x.defaultChecked = x.checked = s.data;
 x.onclick = x.onkeyup = x.oninput = x.onchange = x.onpropertychange = function() { sv(s, x.checked) };
 return x;
 }
 function tbx(s) {
+if (suspendScripts)
+return;
 var x = input(document.createElement("textarea"), s,
 function(x) { return function(v) { if (x.value != v) x.value = v; }; });
 x.innerHTML = s.data;
 x.onkeyup = x.oninput = x.onchange = x.onpropertychange = function() { sv(s, x.value) };
 return x;
 }
 function dynClass(html, s_class, s_style) {
+if (suspendScripts)
+return;
 var htmlCls = {v : null};
 html = flatten(htmlCls, html);
 htmlCls = htmlCls.v;
 var dummy = document.createElement("body");
+suspendScripts = true;
 dummy.innerHTML = html;
+suspendScripts = false;
 var html = dummy.firstChild;
 dummy.removeChild(html);
 addNode(html);
 runScripts(html);
 function fresh() {
 return "uw" + (--nextId);
 }
 function giveFocus(id) {
-window.setTimeout(function() {
+var node = document.getElementById(id);
-var node = document.getElementById(id);
+if (node)
-if (node)
+node.focus();
-node.focus();
+else
-else
+er("Tried to give focus to ID not used in document: " + id);
-er("Tried to give focus to ID not used in document: " + id);
-}, 0);
 }
 // App-specific code