From cd280eb8f0a5f6f4683f9fb34bb92c0bfed94ddc Mon Sep 17 00:00:00 2001 From: Scott Tolksdorf Date: Sat, 14 May 2016 14:37:07 -0400 Subject: [PATCH] Winged border on note blocks working --- client/homebrew/pages/editPage/editPage.jsx | 33 ++++------------ client/homebrew/pages/editPage/editPage.less | 9 ++++- client/homebrew/phbStyle/note_border.png | Bin 0 -> 530 bytes client/homebrew/phbStyle/phb.assets.less | 3 +- client/homebrew/phbStyle/phb.style.less | 10 ++++- phb.standalone.css | 39 +++++++------------ todo.md | 9 +++-- 7 files changed, 44 insertions(+), 59 deletions(-) create mode 100644 client/homebrew/phbStyle/note_border.png diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx index 55abe8a..1cc4d1b 100644 --- a/client/homebrew/pages/editPage/editPage.jsx +++ b/client/homebrew/pages/editPage/editPage.jsx @@ -40,27 +40,20 @@ var EditPage = React.createClass({ return { title : this.props.brew.title, text: this.props.brew.text, - isSaving : false, - isPending : false, - errors : null, - lastUpdated : this.props.brew.updatedAt }; }, - savedBrew : null, - componentDidMount: function(){ this.debounceSave = _.debounce(this.save, SAVE_TIMEOUT); - window.onbeforeunload = ()=>{ - //do state checks - - //return "You have unsaved changes!"; + if(this.state.isSaving || this.state.isPending){ + return 'You have unsaved changes!'; + } } }, componentWillUnmount: function() { @@ -112,7 +105,6 @@ var EditPage = React.createClass({ }, save : function(){ - console.log('saving!'); this.debounceSave.cancel(); this.setState({ isSaving : true @@ -125,7 +117,6 @@ var EditPage = React.createClass({ title : this.state.title }) .end((err, res) => { - console.log('done', res.body); this.savedBrew = res.body; this.setState({ isPending : false, @@ -136,34 +127,24 @@ var EditPage = React.createClass({ }, renderSaveButton : function(){ - if(this.state.isSaving){ - return saving... + return saving... } - - if(!this.state.isPending && !this.state.isSaving){ - return saved. + return saved. } - if(this.state.isPending && this.hasChanges()){ - return Save Now + return Save Now } - }, - - - renderNavbar : function(){ return - {this.renderSaveButton()} - - + Share diff --git a/client/homebrew/pages/editPage/editPage.less b/client/homebrew/pages/editPage/editPage.less index 605b59c..e307ec1 100644 --- a/client/homebrew/pages/editPage/editPage.less +++ b/client/homebrew/pages/editPage/editPage.less @@ -1,5 +1,12 @@ .editPage{ - + .navItem.save{ + width : 75px; + text-align: center; + &.saved{ + color : #666; + cursor : initial; + } + } } \ No newline at end of file diff --git a/client/homebrew/phbStyle/note_border.png b/client/homebrew/phbStyle/note_border.png new file mode 100644 index 0000000000000000000000000000000000000000..bf7b30188c1e90112fcce7f91b7ad48ec815f63c GIT binary patch literal 530 zcmeAS@N?(olHy`uVBq!ia0vp^0YGfS!3HEhs@wJeDVB6cUq=Rpjs4tz5?O(K&H|6f zVg?4jLmG+w|5Tu9(E9DeQ5i{gHcmKbxDVaqvXpbBaJ2{jYcMo24!|*;Wr!P{&V_UuDj@^SQcZw%mPd-yV*R*!N=5JL%B5)=xIyczn+{f-wo&g;yVjWdyT3%zopr0DAK3!T