mirror of
https://github.com/naturalcrit/homebrewery.git
synced 2026-01-02 08:32:41 +00:00
Merge branch 'PRODUCTION' into master
This commit is contained in:
@@ -69,4 +69,4 @@ module.exports = function(brew){
|
|||||||
##### Table Of Contents
|
##### Table Of Contents
|
||||||
${markdown}
|
${markdown}
|
||||||
</div>\n`;
|
</div>\n`;
|
||||||
};
|
};
|
||||||
@@ -74,9 +74,9 @@ const CodeEditor = createClass({
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
componentWillReceiveProps : function(nextProps){
|
componentDidUpdate : function(prevProps) {
|
||||||
if(this.codeMirror && nextProps.value !== undefined && this.codeMirror.getValue() != nextProps.value) {
|
if(this.codeMirror && this.codeMirror.getValue() != this.props.value) {
|
||||||
this.codeMirror.setValue(nextProps.value);
|
this.codeMirror.setValue(this.props.value);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
@@ -11,18 +11,10 @@ renderer.html = function (html) {
|
|||||||
html = html.substring(0, html.lastIndexOf('</div>'));
|
html = html.substring(0, html.lastIndexOf('</div>'));
|
||||||
return `${openTag} ${Markdown(html)} </div>`;
|
return `${openTag} ${Markdown(html)} </div>`;
|
||||||
}
|
}
|
||||||
//if(html.startsWith('<dt>'))
|
|
||||||
// if(_.startsWith(_.trim(html), '<style') && _.endsWith(_.trim(html), '</style>')){
|
|
||||||
// const openTag = html.substring(0, html.indexOf('>')+1);
|
|
||||||
// html = html.substring(html.indexOf('>')+1);
|
|
||||||
// html = html.substring(0, html.lastIndexOf('</style>'));
|
|
||||||
// html = html.replaceAll(/\s(\.[^{]*)/gm, '.V3 $1');
|
|
||||||
// return `${openTag} ${html} </style>`;
|
|
||||||
// }
|
|
||||||
return html;
|
return html;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Don't render {{ Divs or {{ empty Spans on their own line inside a <p>
|
// Don't wrap {{ Divs or {{ empty Spans in <p> tags
|
||||||
renderer.paragraph = function(text){
|
renderer.paragraph = function(text){
|
||||||
let match;
|
let match;
|
||||||
if(text.startsWith('<div') || text.startsWith('</div'))
|
if(text.startsWith('<div') || text.startsWith('</div'))
|
||||||
|
|||||||
Reference in New Issue
Block a user