From 6209fcd5cb56cb3a08304a701e704f35b8196579 Mon Sep 17 00:00:00 2001 From: Scott Tolksdorf Date: Wed, 18 May 2016 00:20:07 -0400 Subject: [PATCH] Brew content will now not server render jsut incase it has malformed html, so it wont break the page --- client/homebrew/brewRenderer/brewRenderer.jsx | 8 ++++++-- client/homebrew/navbar/navbar.jsx | 2 +- package.json | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx index 67a6fbd64..591e593d1 100644 --- a/client/homebrew/brewRenderer/brewRenderer.jsx +++ b/client/homebrew/brewRenderer/brewRenderer.jsx @@ -15,7 +15,8 @@ var BrewRenderer = React.createClass({ getInitialState: function() { return { viewablePageNumber: 0, - height : 0 + height : 0, + isMounted : false }; }, totalPages : 0, @@ -23,7 +24,8 @@ var BrewRenderer = React.createClass({ componentDidMount: function() { this.setState({ - height : this.refs.main.parentNode.clientHeight + height : this.refs.main.parentNode.clientHeight, + isMounted : true }); }, handleScroll : function(e){ @@ -36,6 +38,8 @@ var BrewRenderer = React.createClass({ }, shouldRender : function(pageText, index){ + if(!this.state.isMounted) return false; + var viewIndex = this.state.viewablePageNumber; if(index == viewIndex - 1) return true; if(index == viewIndex) return true; diff --git a/client/homebrew/navbar/navbar.jsx b/client/homebrew/navbar/navbar.jsx index 38de185a8..84f1daf1d 100644 --- a/client/homebrew/navbar/navbar.jsx +++ b/client/homebrew/navbar/navbar.jsx @@ -11,7 +11,7 @@ var Navbar = React.createClass({
The Homebrewery
- v2.0.0 + v2.0.1 {this.props.children} diff --git a/package.json b/package.json index 6cfa71a9b..4ff504ce7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "naturalcrit", "description": "D&D Tools for the discerning DM", - "version": "2.0.0", + "version": "2.0.1", "scripts": { "postinstall": "gulp prod", "start": "node server.js"