Merge pull request reactjs#46 from spicyj/san-md

Use marked instead of Showdown and escape HTML
magus0219 · Apr 13, 2015 · a1eff30 · a1eff30
2 parents a91501d + 233dbf7
commit a1eff30
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/public/index.html b/public/index.html
@@ -7,7 +7,7 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/react/0.13.0/react.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/react/0.13.0/JSXTransformer.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/showdown/0.3.1/showdown.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/marked/0.3.2/marked.min.js"></script>
   </head>
   <body>
     <div id="content"></div>

diff --git a/public/scripts/example.js b/public/scripts/example.js
@@ -10,11 +10,9 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-var converter = new Showdown.converter();
-
 var Comment = React.createClass({
   render: function() {
-    var rawMarkup = converter.makeHtml(this.props.children.toString());
+    var rawMarkup = marked(this.props.children.toString(), {sanitize: true});
     return (
       <div className="comment">
         <h2 className="commentAuthor">