f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-04 03:52:40 +00:00
Code Wiki Activity

Fix /page not working in legacy mode. (#1233)

Browse Source 
* Fix brew styles overwriting each other.

* Word wrapping, start fixing spacing on Title letter

* Fix \page in legacy brews when not at line start
This commit is contained in:
Trevor Buckner
2021-02-08 13:58:24 -05:00
committed by GitHub
parent c642a35fb3
commit e5ccfa3a50
4 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
client/homebrew/brewRenderer/brewRenderer.jsx
View File

@@ -20,15 +20,17 @@ const BrewRenderer = createClass({
getDefaultProps : function() {
return {
text : '',
renderer : '',
renderer : 'legacy',
errors : []
};
},
getInitialState : function() {
const pages = this.props.text.split(/^\\page/gm);
let renderer = 'legacy';
if(this.props.renderer)
renderer = this.props.renderer;
let pages;
if(this.props.renderer == 'legacy') {
pages = this.props.text.split('\\page');
} else {
pages = this.props.text.split(/^\\page/gm);
}
return {
viewablePageNumber : 0,
@@ -38,7 +40,6 @@ const BrewRenderer = createClass({
pages : pages,
usePPR : pages.length >= PPR_THRESHOLD,
visibility : 'hidden',
renderer : renderer,
initialContent : `<!DOCTYPE html><html><head>
<link href="//use.fontawesome.com/releases/v5.15.1/css/all.css" rel="stylesheet" />
<link href="//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700" rel="stylesheet" type="text/css" />
@@ -54,12 +55,19 @@ const BrewRenderer = createClass({
window.removeEventListener('resize', this.updateSize);
},
componentWillReceiveProps : function(nextProps) {
const pages = nextProps.text.split(/^\\page/gm);
this.setState({
pages : pages,
usePPR : pages.length >= PPR_THRESHOLD
});
componentDidUpdate : function(prevProps) {
if(prevProps.text !== this.props.text) {
let pages;
if(this.props.renderer == 'legacy') {
pages = this.props.text.split('\\page');
} else {
pages = this.props.text.split(/^\\page/gm);
}
this.setState({
pages : pages,
usePPR : pages.length >= PPR_THRESHOLD
});
}
},
updateSize : function() {
@@ -114,7 +122,7 @@ const BrewRenderer = createClass({
},
renderPage : function(pageText, index){
if(this.state.renderer == 'legacy')
if(this.props.renderer == 'legacy')
return <div className='phb' id={`p${index + 1}`} dangerouslySetInnerHTML={{ __html: MarkdownLegacy.render(pageText) }} key={index} />;
else
return <div className='phb3' id={`p${index + 1}`} dangerouslySetInnerHTML={{ __html: Markdown.render(pageText) }} key={index} />;