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

Fixed renderer crashing with malformed html on load

Browse Source
This commit is contained in:
Scott Tolksdorf
2016-12-25 23:44:24 -05:00
parent 75f0a9f755
commit 9fd7586726
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
changelog.md
View File

@@ -8,7 +8,7 @@
- Changed icon for the metadata - Changed icon for the metadata
- Made links useable in footer (thanks u/Dustfinger1 re:249) - Made links useable in footer (thanks u/Dustfinger1 re:249)
- Added print media queries to remove box shadow on print (thanks u/dmmagic re: 246) - Added print media queries to remove box shadow on print (thanks u/dmmagic re: 246)
- Fixed realtime renderer not functioning if loaded with malformed html on load (thanks u/RattiganIV re:247)

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

@@ -33,6 +33,7 @@ const BrewRenderer = React.createClass({
}, },
height : 0, height : 0,
pageHeight : PAGE_HEIGHT, pageHeight : PAGE_HEIGHT,
lastRender : <div></div>,
componentDidMount: function() { componentDidMount: function() {
this.updateSize(); this.updateSize();
@@ -43,7 +44,7 @@ const BrewRenderer = React.createClass({
}, },
componentWillReceiveProps: function(nextProps) { componentWillReceiveProps: function(nextProps) {
if(this.refs.pages.firstChild) this.pageHeight = this.refs.pages.firstChild.clientHeight; if(this.refs.pages && this.refs.pages.firstChild) this.pageHeight = this.refs.pages.firstChild.clientHeight;
const pages = nextProps.text.split('\\page'); const pages = nextProps.text.split('\\page');
this.setState({ this.setState({
@@ -54,7 +55,7 @@ const BrewRenderer = React.createClass({
updateSize : function() { updateSize : function() {
setTimeout(()=>{ setTimeout(()=>{
if(this.refs.pages.firstChild) this.pageHeight = this.refs.pages.firstChild.clientHeight; if(this.refs.pages && this.refs.pages.firstChild) this.pageHeight = this.refs.pages.firstChild.clientHeight;
}, 1); }, 1);
this.setState({ this.setState({
@@ -117,10 +118,11 @@ const BrewRenderer = React.createClass({
} }
}); });
} }
if(this.props.errors && this.props.errors.length) return this.lastRender;
return _.map(this.state.pages, (page, index)=>{ this.lastRender = _.map(this.state.pages, (page, index)=>{
return this.renderPage(page, index); return this.renderPage(page, index);
}); });
return this.lastRender;
}, },
render : function(){ render : function(){

2
client/homebrew/pages/editPage/editPage.jsx
View File

@@ -47,7 +47,7 @@ const EditPage = React.createClass({
isSaving : false, isSaving : false,
isPending : false, isPending : false,
errors : null, errors : null,
htmlErrors : [], htmlErrors : Markdown.validate(this.props.brew.text),
lastUpdated : this.props.brew.updatedAt lastUpdated : this.props.brew.updatedAt
}; };
}, },