From e9bc4a4a0822235afebbefa0c4d660b1be9ae52f Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 25 Sep 2016 15:26:56 +0200 Subject: Limit usernames to 30 chars, statuses to 500, open account after follow form success --- .../components/features/status/components/action_bar.jsx | 6 +++--- .../components/features/ui/components/character_counter.jsx | 7 +++++-- .../components/features/ui/components/compose_form.jsx | 2 +- .../javascripts/components/features/ui/components/follow_form.jsx | 8 ++++++-- .../components/features/ui/containers/follow_form_container.jsx | 4 ++-- 5 files changed, 17 insertions(+), 10 deletions(-) (limited to 'app/assets/javascripts/components/features') diff --git a/app/assets/javascripts/components/features/status/components/action_bar.jsx b/app/assets/javascripts/components/features/status/components/action_bar.jsx index 51332dc95..65c107edc 100644 --- a/app/assets/javascripts/components/features/status/components/action_bar.jsx +++ b/app/assets/javascripts/components/features/status/components/action_bar.jsx @@ -18,9 +18,9 @@ const ActionBar = React.createClass({ return (
-
-
-
+
this.props.onReply(status)} />
+
this.props.onReblog(status)} />
+
this.props.onFavourite(status)} />
); } diff --git a/app/assets/javascripts/components/features/ui/components/character_counter.jsx b/app/assets/javascripts/components/features/ui/components/character_counter.jsx index dd9218844..f0c1b7c8d 100644 --- a/app/assets/javascripts/components/features/ui/components/character_counter.jsx +++ b/app/assets/javascripts/components/features/ui/components/character_counter.jsx @@ -3,15 +3,18 @@ import PureRenderMixin from 'react-addons-pure-render-mixin'; const CharacterCounter = React.createClass({ propTypes: { - text: React.PropTypes.string.isRequired + text: React.PropTypes.string.isRequired, + max: React.PropTypes.number.isRequired }, mixins: [PureRenderMixin], render () { + const diff = this.props.max - this.props.text.length; + return ( - {this.props.text.length} + {diff} ); } diff --git a/app/assets/javascripts/components/features/ui/components/compose_form.jsx b/app/assets/javascripts/components/features/ui/components/compose_form.jsx index 9453f22ff..5542b4fb4 100644 --- a/app/assets/javascripts/components/features/ui/components/compose_form.jsx +++ b/app/assets/javascripts/components/features/ui/components/compose_form.jsx @@ -53,7 +53,7 @@ const ComposeForm = React.createClass({
-
+
); diff --git a/app/assets/javascripts/components/features/ui/components/follow_form.jsx b/app/assets/javascripts/components/features/ui/components/follow_form.jsx index a9d73a9a1..ec108fdb2 100644 --- a/app/assets/javascripts/components/features/ui/components/follow_form.jsx +++ b/app/assets/javascripts/components/features/ui/components/follow_form.jsx @@ -3,6 +3,10 @@ import PureRenderMixin from 'react-addons-pure-render-mixin'; const FollowForm = React.createClass({ + contextTypes: { + router: React.PropTypes.object + }, + propTypes: { text: React.PropTypes.string.isRequired, is_submitting: React.PropTypes.bool, @@ -18,12 +22,12 @@ const FollowForm = React.createClass({ handleKeyUp (e) { if (e.keyCode === 13) { - this.props.onSubmit(); + this.handleSubmit(); } }, handleSubmit () { - this.props.onSubmit(); + this.props.onSubmit(this.context.router); }, render () { diff --git a/app/assets/javascripts/components/features/ui/containers/follow_form_container.jsx b/app/assets/javascripts/components/features/ui/containers/follow_form_container.jsx index a21c1291b..05cfb7c1d 100644 --- a/app/assets/javascripts/components/features/ui/containers/follow_form_container.jsx +++ b/app/assets/javascripts/components/features/ui/containers/follow_form_container.jsx @@ -15,8 +15,8 @@ const mapDispatchToProps = function (dispatch) { dispatch(changeFollow(text)); }, - onSubmit: function () { - dispatch(submitFollow()); + onSubmit: function (router) { + dispatch(submitFollow(router)); } } }; -- cgit