Fix not being able to vote (#13490)
Fix regression introduced by ab8d7c0680
			
			
This commit is contained in:
		@@ -4,7 +4,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 | 
			
		||||
import ImmutablePureComponent from 'react-immutable-pure-component';
 | 
			
		||||
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 | 
			
		||||
import classNames from 'classnames';
 | 
			
		||||
import { vote } from 'mastodon/actions/polls';
 | 
			
		||||
import Motion from 'mastodon/features/ui/util/optional_motion';
 | 
			
		||||
import spring from 'react-motion/lib/spring';
 | 
			
		||||
import escapeTextContentForBrowser from 'escape-html';
 | 
			
		||||
@@ -28,9 +27,9 @@ class Poll extends ImmutablePureComponent {
 | 
			
		||||
  static propTypes = {
 | 
			
		||||
    poll: ImmutablePropTypes.map,
 | 
			
		||||
    intl: PropTypes.object.isRequired,
 | 
			
		||||
    dispatch: PropTypes.func,
 | 
			
		||||
    disabled: PropTypes.bool,
 | 
			
		||||
    refresh: PropTypes.func,
 | 
			
		||||
    onVote: PropTypes.func,
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  state = {
 | 
			
		||||
@@ -101,7 +100,7 @@ class Poll extends ImmutablePureComponent {
 | 
			
		||||
      return;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    this.props.dispatch(vote(this.props.poll.get('id'), Object.keys(this.state.selected)));
 | 
			
		||||
    this.props.onVote(Object.keys(this.state.selected));
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  handleRefresh = () => {
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@ import { connect } from 'react-redux';
 | 
			
		||||
import { debounce } from 'lodash';
 | 
			
		||||
 | 
			
		||||
import Poll from 'mastodon/components/poll';
 | 
			
		||||
import { fetchPoll } from 'mastodon/actions/polls';
 | 
			
		||||
import { fetchPoll, vote } from 'mastodon/actions/polls';
 | 
			
		||||
 | 
			
		||||
const mapDispatchToProps = (dispatch, { pollId }) => ({
 | 
			
		||||
  refresh: debounce(
 | 
			
		||||
@@ -12,6 +12,10 @@ const mapDispatchToProps = (dispatch, { pollId }) => ({
 | 
			
		||||
    1000,
 | 
			
		||||
    { leading: true },
 | 
			
		||||
  ),
 | 
			
		||||
 | 
			
		||||
  onVote (choices) {
 | 
			
		||||
    dispatch(vote(pollId, choices));
 | 
			
		||||
  },
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
const mapStateToProps = (state, { pollId }) => ({
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user