From fb5324f8180b089c75f12d165869909db941878f Mon Sep 17 00:00:00 2001 From: Saulo Araujo Date: Sat, 16 Jul 2016 14:06:00 -0300 Subject: Fix for "normalizeTable" nesting thead and tfoot in tbody --- lib/js/urweb.js | 10 ++++++---- tests/normalizeTable.ur | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ tests/normalizeTable.urp | 1 + tests/normalizeTable.urs | 1 + 4 files changed, 58 insertions(+), 4 deletions(-) create mode 100644 tests/normalizeTable.ur create mode 100644 tests/normalizeTable.urp create mode 100644 tests/normalizeTable.urs diff --git a/lib/js/urweb.js b/lib/js/urweb.js index 1f44a97b..68e7979d 100644 --- a/lib/js/urweb.js +++ b/lib/js/urweb.js @@ -879,10 +879,12 @@ function normalizeTable(table) { for (script = table.firstChild; script && script != tbody; script = next) { next = script.nextSibling; - if (firstChild) - tbody.insertBefore(script, firstChild); - else - tbody.appendChild(script); + if (script.tagName === "SCRIPT") { + if (firstChild) + tbody.insertBefore(script, firstChild); + else + tbody.appendChild(script); + } } return; diff --git a/tests/normalizeTable.ur b/tests/normalizeTable.ur new file mode 100644 index 00000000..be16d935 --- /dev/null +++ b/tests/normalizeTable.ur @@ -0,0 +1,50 @@ +fun main () = +visible <- source True; +return + + +
+

Static table

+ + + + + + + + + + + + + +
Column 0Column 1
AB
+
+ +
+

Dynamic table

+ + + + + + + + + + + + + + + else + ) + }/> + +
Column 0Column 1
AB
+
+ + diff --git a/tests/normalizeTable.urp b/tests/normalizeTable.urp new file mode 100644 index 00000000..e22cda3b --- /dev/null +++ b/tests/normalizeTable.urp @@ -0,0 +1 @@ +normalizeTable diff --git a/tests/normalizeTable.urs b/tests/normalizeTable.urs new file mode 100644 index 00000000..9e80cf40 --- /dev/null +++ b/tests/normalizeTable.urs @@ -0,0 +1 @@ +val main: unit -> transaction page -- cgit v1.2.3