Merge branch 'master' into UpdateSolberaImitationFont

client/homebrew/editor/metadataEditor/metadataEditor.jsx

@@ -18,7 +18,7 @@ const MetadataEditor = createClass({
 				published   : false,
 				authors     : [],
 				systems     : [],
-				renderer    : ''
+				renderer    : 'legacy'
 			},
 			onChange : ()=>{}
 		};
@@ -151,8 +151,8 @@ const MetadataEditor = createClass({
 						type='radio'
 						value = 'legacy'
 						name = 'renderer'
-						checked={!this.props.metadata.renderer}
-						onChange={(e)=>this.handleRenderer('', e)} />
+						checked={this.props.metadata.renderer === 'legacy'}
+						onChange={(e)=>this.handleRenderer('legacy', e)} />
 					Legacy
 				</label>
 

client/homebrew/pages/editPage/editPage.jsx

@@ -42,7 +42,7 @@ const EditPage = createClass({
 				published   : false,
 				authors     : [],
 				systems     : [],
-				renderer    : ''
+				renderer    : 'legacy'
 			}
 		};
 	},
@@ -105,7 +105,6 @@ const EditPage = createClass({
 
 	handleMetadataChange : function(metadata){
 		if(metadata.renderer != this.savedBrew.renderer){
-			console.log('renderer changed!');
 			this.setState({
 				alertRenderChange : true
 			});
@@ -345,19 +344,19 @@ const EditPage = createClass({
 			return <Nav.item className='save' onClick={this.save} color='blue' icon='fas fa-save'>Save Now</Nav.item>;
 		}
 		if(!this.state.isPending && !this.state.isSaving){
-			return <Nav.item className='save saved'>saved.
-				{this.state.alertRenderChange &&
-					<div className='errorContainer' onClick={this.closeAlerts}>
-					Rendering mode for this brew has been changed! Refresh the page to load the new renderer.<br />
-						<div className='confirm'>
-							OK
-						</div>
-					</div>
-				}
-			</Nav.item>;
+			return <Nav.item className='save saved'>saved.</Nav.item>;
 		}
 	},
 
+	// {this.state.alertRenderChange &&
+	// 	<div className='errorContainer' onClick={this.closeAlerts}>
+	// 	Rendering mode for this brew has been changed! Refresh the page to load the new renderer.<br />
+	// 		<div className='confirm'>
+	// 			OK
+	// 		</div>
+	// 	</div>
+	// }
+
 	processShareId : function() {
 		return this.state.brew.googleId ?
 					 this.state.brew.googleId + this.state.brew.shareId :

client/homebrew/phbStyle/phb.style.less

@@ -47,7 +47,7 @@ body {
 	overflow          : hidden;
 	height            : 279.4mm;
 	width             : 215.9mm;
-	padding           : 1.0cm 1.7cm, 1.5cm;
+	padding           : 1.0cm 1.7cm 1.5cm;
 	background-color  : @background;
 	background-image  : @backgroundImage;
 	font-family       : BookSanity;

server/googleActions.js

@@ -157,6 +157,7 @@ GoogleActions = {
 																	  lastViewed : brew.lastViewed,
 																	  views      : brew.views,
 																	  version    : brew.version,
+						renderer   : brew.renderer,
 																	  tags       : brew.tags,
 																	  systems    : brew.systems.join() }
 									 },
@@ -230,6 +231,7 @@ GoogleActions = {
 			description : brew.description,
 			tags        : '',
 			published   : brew.published,
+			renderer    : brew.renderer,
 			authors     : [],
 			systems     : []
 		};
@@ -291,6 +293,7 @@ GoogleActions = {
 				lastViewed : obj.data.properties.lastViewed,
 				views      : parseInt(obj.data.properties.views) || 0, //brews with no view parameter will return undefined
 				version    : parseInt(obj.data.properties.version) || 0,
+				renderer   : obj.data.properties.renderer ? obj.data.properties.renderer : 'legacy',
 
 				gDrive   : true,
 				googleId : id

server/homebrew.api.js

@@ -122,8 +122,6 @@ const newGoogleBrew = async (req, res, next)=>{
 
 	req.body = brew;
 
-	console.log(oAuth2Client);
-
 	const newBrew = await GoogleActions.newGoogleBrew(oAuth2Client, brew);
 
 	return res.status(200).send(newBrew);

server/homebrew.model.js

@@ -56,6 +56,8 @@ HomebrewSchema.statics.get = function(query){
 				unzipped = zlib.inflateRawSync(brews[0].textBin);
 				brews[0].text = unzipped.toString();
 			}
+			if(!brews[0].renderer)
+				brews[0].renderer = 'legacy';
 			return resolve(brews[0]);
 		});
 	});

shared/naturalcrit/codeEditor/codeEditor.jsx

@@ -62,15 +62,11 @@ const CodeEditor = createClass({
 	},
 
 	componentDidUpdate : function(prevProps) {
-		if(this.codeMirror && this.props.value !== undefined && this.codeMirror.getValue() != this.props.value) {
+		if(this.codeMirror && this.codeMirror.getValue() != this.props.value) {
 			this.codeMirror.setValue(this.props.value);
 		}
 	},
 
-	shouldComponentUpdate : function(nextProps, nextState) {
-		return false;
-	},
-
 	setCursorPosition : function(line, char){
 		setTimeout(()=>{
 			this.codeMirror.focus();