Mercurial > urweb

changeset 2002:9356e8f91ea4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change <active> to avoid generating an empty <span> for empty content
author Adam Chlipala <adam@chlipala.net>
date Mon, 21 Apr 2014 12:09:58 -0400
parents 16f5f136a807
children 8e45bb2c9046
files lib/js/urweb.js tests/activeEmpty.ur
diffstat 2 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lib/js/urweb.js	Thu Apr 17 17:41:24 2014 -0400
+++ b/lib/js/urweb.js	Mon Apr 21 12:09:58 2014 -0400
@@ -1009,8 +1009,6 @@
     if (suspendScripts)
         return;
 
-    var span = document.createElement("span");
-    addNode(span);
     var ms = maySuspend;
     maySuspend = false;
     try {
@@ -1020,7 +1018,11 @@
         throw e;
     }
     maySuspend = ms;
-    setInnerHTML(span, html);
+    if (html != "") {
+        var span = document.createElement("span");
+        addNode(span);
+        setInnerHTML(span, html);
+    }
 }
 
 function input(x, s, recreate, type, name) {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/activeEmpty.ur	Mon Apr 21 12:09:58 2014 -0400
@@ -0,0 +1,5 @@
+fun main () : transaction page = return <xml><body>
+  <active code={alert "Howdy, neighbor!"; return <xml/>}/>
+  <hr/>
+  <active code={return <xml>This one <b>ain't</b> empty.</xml>}/>
+</body></xml>