Merge pull request marko-js#714 from marko-js/revert-708-705-dynamic-…

…root-id-attr Revert "Fixes marko-js#705 - Throw error when the root HTML element has a dynamic id …"
silotto · Jun 1, 2017 · 5d6b4e3 · 5d6b4e3
2 parents 4eb2047 + a998535
commit 5d6b4e3
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 21 deletions.
diff --git a/src/components/taglib/TransformHelper/handleRootNodes.js b/src/components/taglib/TransformHelper/handleRootNodes.js
@@ -199,16 +199,9 @@ module.exports = function handleRootNodes() {
                     hasLegacyExplicitBind = true;
                 } else {
                     if (node.hasAttribute('id')) {
-                        let id = node.getAttributeValue('id');
-
-                        if (id && id.type !== 'Literal') {
-                            context.addError('Root HTML element should not have a dynamic `id` attribute. See: https://github.com/marko-js/marko/wiki/Error:-Dynamic-root-HTML-element-id-attribute');
-                            return;
-                        }
-
                         hasIdCount++;
                         nodeWithAssignedId = node;
-                        assignedId = id;
+                        assignedId = node.getAttributeValue('id');
                     }
 
                     if (tagName === 'style') {

diff --git a/test/autotests/render/error-variable-id-root-node/template.marko b/test/autotests/render/error-variable-id-root-node/template.marko
diff --git a/test/autotests/render/error-variable-id-root-node/test.js b/test/autotests/render/error-variable-id-root-node/test.js
diff --git a/test/autotests/render/shorthand-div-id-dynamic/expected.html b/test/autotests/render/shorthand-div-id-dynamic/expected.html
@@ -1 +1 @@
-<div><div style="color: red;" id="foo-Frank">Hello Frank!</div></div>
+<div style="color: red;" id="foo-Frank">Hello Frank!</div>
diff --git a/test/autotests/render/shorthand-div-id-dynamic/template.marko b/test/autotests/render/shorthand-div-id-dynamic/template.marko
@@ -1,3 +1,2 @@
-div
-    div#foo-${input.name} style="color: red;"
-        -- Hello ${input.name}!
+div#foo-${input.name} style="color: red;"
+    -- Hello ${input.name}!
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<div><div style="color: red;" id="foo-Frank">Hello Frank!</div></div>
		<div style="color: red;" id="foo-Frank">Hello Frank!</div>