From 4e38c1a050161742b87eb4271317a82122e881fb Mon Sep 17 00:00:00 2001 From: Ray Schamp Date: Wed, 7 Oct 2015 20:21:10 -0400 Subject: [PATCH 1/4] Fix GH-25: close dropdowns on login/logout --- src/components/navigation/navigation.jsx | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/components/navigation/navigation.jsx b/src/components/navigation/navigation.jsx index 277c66c75..2c45a4908 100644 --- a/src/components/navigation/navigation.jsx +++ b/src/components/navigation/navigation.jsx @@ -26,6 +26,14 @@ module.exports = React.createClass({ 'accountNavOpen': false }; }, + componentDidUpdate: function (prevProps, prevState) { + if (prevState.session.user != this.state.session.user) { + this.setState({ + 'loginOpen': false, + 'accountNavOpen': false + }); + } + }, handleLoginClick: function (e) { e.preventDefault(); this.setState({'loginOpen': true}); From 3d7f5ee66bd2511abdb08146992028dc19f45b42 Mon Sep 17 00:00:00 2001 From: Ray Schamp Date: Wed, 7 Oct 2015 22:26:57 -0400 Subject: [PATCH 2/4] Fix GH-21: toggle dropdown when clicking Sign in --- src/components/navigation/navigation.jsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/navigation/navigation.jsx b/src/components/navigation/navigation.jsx index 2c45a4908..77f954d3b 100644 --- a/src/components/navigation/navigation.jsx +++ b/src/components/navigation/navigation.jsx @@ -36,7 +36,7 @@ module.exports = React.createClass({ }, handleLoginClick: function (e) { e.preventDefault(); - this.setState({'loginOpen': true}); + this.setState({'loginOpen': !this.state.loginOpen}); }, closeLogin: function () { this.setState({'loginOpen': false}); @@ -129,7 +129,10 @@ module.exports = React.createClass({ ] : [
  • Join Scratch
  • ,
  • - Sign In + Sign In Date: Wed, 7 Oct 2015 22:30:55 -0400 Subject: [PATCH 3/4] /# is for suckers. preventDefault all the things --- src/components/navigation/navigation.jsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/components/navigation/navigation.jsx b/src/components/navigation/navigation.jsx index 77f954d3b..1908d4bd5 100644 --- a/src/components/navigation/navigation.jsx +++ b/src/components/navigation/navigation.jsx @@ -60,7 +60,8 @@ module.exports = React.createClass({ } }.bind(this)); }, - handleLogOut: function () { + handleLogOut: function (e) { + e.preventDefault(); xhr({ uri: '/accounts/logout/' }, function (err) { @@ -72,7 +73,8 @@ module.exports = React.createClass({ } }.bind(this)); }, - handleClickAccountNav: function () { + handleAccountNavClick: function (e) { + e.preventDefault(); this.setState({'accountNavOpen': true}); }, closeAccountNav: function () { @@ -110,7 +112,7 @@ module.exports = React.createClass({ My Stuff
  • ,
  • - + {this.state.session.user.username} From 0f395255b0143717805175a379805f943eca4ff1 Mon Sep 17 00:00:00 2001 From: Ray Schamp Date: Wed, 7 Oct 2015 22:32:23 -0400 Subject: [PATCH 4/4] Fix GH-23: link Explore to 30 day view --- src/components/navigation/navigation.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/navigation/navigation.jsx b/src/components/navigation/navigation.jsx index 1908d4bd5..e4472acf4 100644 --- a/src/components/navigation/navigation.jsx +++ b/src/components/navigation/navigation.jsx @@ -91,7 +91,7 @@ module.exports = React.createClass({
  • Create
  • -
  • Explore
  • +
  • Explore
  • Discuss
  • About
  • Help