diff --git a/client/homebrew/navbar/print.navitem.jsx b/client/homebrew/navbar/print.navitem.jsx index f4c081e10..8ca2ca202 100644 --- a/client/homebrew/navbar/print.navitem.jsx +++ b/client/homebrew/navbar/print.navitem.jsx @@ -2,7 +2,7 @@ var React = require('react'); var Nav = require('naturalcrit/nav/nav.jsx'); module.exports = function(props){ - return + return print }; \ No newline at end of file diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx index 8c9c48444..0a8076a29 100644 --- a/client/homebrew/pages/editPage/editPage.jsx +++ b/client/homebrew/pages/editPage/editPage.jsx @@ -85,7 +85,7 @@ var EditPage = React.createClass({ handleTitleChange : function(title){ this.setState({ title : title, - pending : true + isPending : true }); (this.hasChanges() ? this.debounceSave() : this.debounceSave.cancel()); @@ -94,7 +94,7 @@ var EditPage = React.createClass({ handleTextChange : function(text){ this.setState({ text : text, - pending : true + isPending : true }); (this.hasChanges() ? this.debounceSave() : this.debounceSave.cancel()); @@ -125,6 +125,10 @@ var EditPage = React.createClass({ save : function(){ console.log('saving!'); this.debounceSave.cancel(); + this.setState({ + isSaving : true + }); + request .put('/homebrew/api/update/' + this.props.brew.editId) .send({text : this.state.text}) @@ -132,19 +136,28 @@ var EditPage = React.createClass({ console.log('done', res.body); this.savedBrew = res.body; this.setState({ - pending : false, + isPending : false, + isSaving : false, lastUpdated : res.body.updatedAt }) }) }, renderSaveButton : function(){ + + if(this.state.isSaving){ + + return saving... + + } + + if(!this.state.isPending && !this.state.isSaving){ - //saved - }else if(this.state.isPending && this.hasChanges()){ - //save now - }else if(this.state.isSaving){ - //saving + return saved. + } + + if(this.state.isPending && this.hasChanges()){ + return Save Now } }, @@ -158,6 +171,8 @@ var EditPage = React.createClass({ + {this.renderSaveButton()} + Share diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx index 1184e9cf6..9355db04e 100644 --- a/client/homebrew/pages/newPage/newPage.jsx +++ b/client/homebrew/pages/newPage/newPage.jsx @@ -86,7 +86,7 @@ var NewPage = React.createClass({ renderSaveButton : function(){ if(this.state.isSaving){ - return + return save... }else{ diff --git a/client/homebrew/pages/sharePage/sharePage.jsx b/client/homebrew/pages/sharePage/sharePage.jsx index 49d0bbd55..04c7ff875 100644 --- a/client/homebrew/pages/sharePage/sharePage.jsx +++ b/client/homebrew/pages/sharePage/sharePage.jsx @@ -5,6 +5,8 @@ var cx = require('classnames'); var Nav = require('naturalcrit/nav/nav.jsx'); var Navbar = require('../../navbar/navbar.jsx'); +var PrintLink = require('../../navbar/print.navitem.jsx'); + var BrewRenderer = require('../../brewRenderer/brewRenderer.jsx'); var replaceAll = function(str, find, replace) { @@ -34,9 +36,6 @@ var SharePage = React.createClass({ render : function(){ - - console.log('brew', this.props.brew); - return
@@ -44,9 +43,7 @@ var SharePage = React.createClass({ - - print - + source