diff --git a/client/homebrew/editor/metadataEditor/metadataEditor.jsx b/client/homebrew/editor/metadataEditor/metadataEditor.jsx index c969e882d..89f6f4bb4 100644 --- a/client/homebrew/editor/metadataEditor/metadataEditor.jsx +++ b/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 diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx index c8d5b6920..4e58e9f1c 100644 --- a/client/homebrew/pages/editPage/editPage.jsx +++ b/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 Save Now; } if(!this.state.isPending && !this.state.isSaving){ - return saved. - {this.state.alertRenderChange && -
- Rendering mode for this brew has been changed! Refresh the page to load the new renderer.
-
- OK -
-
- } -
; + return saved.; } }, + // {this.state.alertRenderChange && + //
+ // Rendering mode for this brew has been changed! Refresh the page to load the new renderer.
+ //
+ // OK + //
+ //
+ // } + processShareId : function() { return this.state.brew.googleId ? this.state.brew.googleId + this.state.brew.shareId : diff --git a/client/homebrew/phbStyle/phb.style.less b/client/homebrew/phbStyle/phb.style.less index e4eed24e5..792755ade 100644 --- a/client/homebrew/phbStyle/phb.style.less +++ b/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; diff --git a/server/googleActions.js b/server/googleActions.js index 1fc93a861..1a8d656ac 100644 --- a/server/googleActions.js +++ b/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 diff --git a/server/homebrew.api.js b/server/homebrew.api.js index e934aa803..e88a3ef88 100644 --- a/server/homebrew.api.js +++ b/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); diff --git a/server/homebrew.model.js b/server/homebrew.model.js index 1eeb4409b..9a4b14427 100644 --- a/server/homebrew.model.js +++ b/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]); }); }); diff --git a/shared/naturalcrit/codeEditor/codeEditor.jsx b/shared/naturalcrit/codeEditor/codeEditor.jsx index e5e570116..0f881883d 100644 --- a/shared/naturalcrit/codeEditor/codeEditor.jsx +++ b/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();