{"patch":"diff --git a\/src\/browser\/ui\/__tests__\/ReactDOMComponent-test.js b\/src\/browser\/ui\/__tests__\/ReactDOMComponent-test.js\nindex b436ee4a93..de7ad39ba0 100644\n--- a\/src\/browser\/ui\/__tests__\/ReactDOMComponent-test.js\n+++ b\/src\/browser\/ui\/__tests__\/ReactDOMComponent-test.js\n@@ -668,7 +668,8 @@ describe('ReactDOMComponent', function() {\n \n expect(console.error.calls.length).toBe(1);\n expect(console.error.calls[0].args[0]).toBe(\n- 'Warning: validateDOMNesting(...):

cannot contain a node.'\n+ 'Warning: validateDOMNesting(...): cannot appear as a child of ' +\n+ '

in this context (div > div).'\n );\n });\n \n@@ -679,7 +680,8 @@ describe('ReactDOMComponent', function() {\n \n expect(console.error.calls.length).toBe(1);\n expect(console.error.calls[0].args[0]).toBe(\n- 'Warning: validateDOMNesting(...):

cannot contain a node.'\n+ 'Warning: validateDOMNesting(...): cannot appear as a child of ' +\n+ '

in this context (p).'\n );\n });\n \n@@ -694,9 +696,10 @@ describe('ReactDOMComponent', function() {\n \n expect(console.error.calls.length).toBe(1);\n expect(console.error.calls[0].args[0]).toBe(\n- 'Warning: validateDOMNesting(...):

cannot contain a ' +\n- 'node. Add a to your code to match the DOM tree generated by ' +\n- 'the browser. Check the render method of `Foo`.'\n+ 'Warning: validateDOMNesting(...): cannot appear as a child of ' +\n+ '

in this context (div > table). Add a to your code ' +\n+ 'to match the DOM tree generated by the browser. Check the render ' +\n+ 'method of `Foo`.'\n );\n });\n });\ndiff --git a\/src\/browser\/validateDOMNesting.js b\/src\/browser\/validateDOMNesting.js\nindex e759b3eba6..3ac521d0d7 100644\n--- a\/src\/browser\/validateDOMNesting.js\n+++ b\/src\/browser\/validateDOMNesting.js\n@@ -176,6 +176,10 @@ if (__DEV__) {\n tag === 'noscript' || tag === 'noframes' || tag === 'style' ||\n tag === 'script' || tag === 'template'\n );\n+\n+ \/\/ https:\/\/html.spec.whatwg.org\/multipage\/semantics.html#the-html-element\n+ case 'html':\n+ return tag === 'head' || tag === 'body';\n }\n \n \/\/ Probably in the \"in body\" parsing mode, so we outlaw only tag combos\n@@ -292,9 +296,11 @@ if (__DEV__) {\n \n warning(\n false,\n- 'validateDOMNesting(...): <%s> cannot contain a <%s> node.%s',\n- parentTag,\n+ 'validateDOMNesting(...): <%s> cannot appear as a child of <%s> ' +\n+ 'in this context (%s).%s',\n childTag,\n+ parentTag,\n+ parentStack.join(' > '),\n info\n );\n }\n","commit":{"shortRevision":"a4630c3928","subject":"Merge pull request #3520 from spicyj\/validate-message","authorName":"Ben Alpert","revision":"a4630c39286b6a669f0d68be9830a4de7fd3d76c","authorEmail":"ben@benalpert.com","authoredAt":"2015-03-25T17:43:55-07:00"},"parents":["da598c6a27ff823dd220638c4ddf84b0e425c170","7c6694987dcae9ee1e471c9ee8541fb2dfb9052f"],"body":"Tweak validation message, add html support","files":[{"status":"M","path":"src\/browser\/ui\/__tests__\/ReactDOMComponent-test.js"},{"status":"M","path":"src\/browser\/validateDOMNesting.js"}]}

dillon1000/react

Files changed