Yuki Takei 9 лет назад
Родитель
Сommit
fd0ce5ec5f

+ 3 - 1
resource/js/components/Page/PageBody.js

@@ -15,7 +15,7 @@ export default class PageBody extends React.Component {
       body = this.props.page.revision.body;
     }
 
-    return { __html: this.crowiRenderer.render(body) };
+    return { __html: this.crowiRenderer.render(body, this.props.rendererOptions) };
   }
 
   render() {
@@ -33,10 +33,12 @@ export default class PageBody extends React.Component {
 PageBody.propTypes = {
   page: React.PropTypes.object.isRequired,
   pageBody: React.PropTypes.string,
+  rendererOptions: React.PropTypes.object
 };
 
 PageBody.defaultProps = {
   page: {},
   pageBody: '',
+  rendererOptions: {},
 };
 

+ 11 - 1
resource/js/components/SearchPage/SearchResultList.js

@@ -29,13 +29,23 @@ export default class SearchResultList extends React.Component {
   }
 
   render() {
+    var isEnabledLineBreaks = $('#content-main').data('linebreaks-enabled');
+
+    // generate options obj
+    var rendererOptions = {
+      // see: https://www.npmjs.com/package/marked
+      marked: {
+        breaks: isEnabledLineBreaks
+      }
+    };
+
     const resultList = this.props.pages.map((page) => {
       const pageBody = this.getHighlightBody(page.revision.body);
       return (
         <div id={page._id} key={page._id} className="search-result-page">
           <h2><a href={page.path}>{page.path}</a></h2>
           <div className="wiki">
-            <PageBody className="hige" page={page} pageBody={pageBody} />
+            <PageBody className="hige" page={page} pageBody={pageBody} rendererOptions={rendererOptions} />
           </div>
         </div>
       );