{"parents":["c561324e7ea3bbdb4c570ff54304ceaa199ad810","52d8d3b2ff7b0d50cc8f20a99e5707c11aeace0d"],"commit":{"shortRevision":"06568114f3","authorEmail":"paul@oshannessy.com","revision":"06568114f3a23c5509809633a4e5e4f3b90a531a","authoredAt":"2015-09-22T10:53:50-07:00","authorName":"Paul O’Shannessy","subject":"Merge pull request #4931 from bspaulding\/safe-taint-docs"},"patch":"diff --git a\/docs\/_js\/examples\/markdown.js b\/docs\/_js\/examples\/markdown.js\nindex 52a6e5caf5..249f978bfc 100644\n--- a\/docs\/_js\/examples\/markdown.js\n+++ b\/docs\/_js\/examples\/markdown.js\n@@ -6,6 +6,9 @@ var MarkdownEditor = React.createClass({\n handleChange: function() {\n this.setState({value: React.findDOMNode(this.refs.textarea).value});\n },\n+ rawMarkup: function() {\n+ return { __html: marked(this.state.value, {sanitize: true}) };\n+ },\n render: function() {\n return (\n

\n@@ -17,9 +20,7 @@ var MarkdownEditor = React.createClass({\n

Output<\/h3>\n \n <\/div>\n );\ndiff --git a\/docs\/docs\/tutorial.md b\/docs\/docs\/tutorial.md\nindex 621b514f5b..1d0d3e874b 100644\n--- a\/docs\/docs\/tutorial.md\n+++ b\/docs\/docs\/tutorial.md\n@@ -257,14 +257,18 @@ That's React protecting you from an [XSS attack](https:\/\/en.wikipedia.org\/wiki\/C\n ```javascript{4,10}\n \/\/ tutorial7.js\n var Comment = React.createClass({\n- render: function() {\n+ rawMarkup: function() {\n var rawMarkup = marked(this.props.children.toString(), {sanitize: true});\n+ return { __html: rawMarkup };\n+ },\n+\n+ render: function() {\n return (\n
\n
\n {this.props.author}\n <\/h2>\n- \n+ \n <\/div>\n );\n }\n","files":[{"status":"M","path":"docs\/_js\/examples\/markdown.js"},{"status":"M","path":"docs\/docs\/tutorial.md"}],"body":"Extracted \"safe taint\" in docs\/homepage to align with best practice"}

dillon1000/react

Files changed