Browse Source

Fix web UI crash on page load when detailed status has a poll (#10139)

master
Eugen Rochko 5 years ago
committed by GitHub
parent
commit
5dfa433698
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
  1. +9
    -4
      app/javascript/mastodon/components/poll.js

+ 9
- 4
app/javascript/mastodon/components/poll.js View File

@ -45,7 +45,7 @@ export default @injectIntl
class Poll extends ImmutablePureComponent {
static propTypes = {
poll: ImmutablePropTypes.map.isRequired,
poll: ImmutablePropTypes.map,
intl: PropTypes.object.isRequired,
dispatch: PropTypes.func,
disabled: PropTypes.bool,
@ -122,9 +122,14 @@ class Poll extends ImmutablePureComponent {
render () {
const { poll, intl } = this.props;
const timeRemaining = timeRemainingString(intl, new Date(poll.get('expires_at')), intl.now());
const showResults = poll.get('voted') || poll.get('expired');
const disabled = this.props.disabled || Object.entries(this.state.selected).every(item => !item);
if (!poll) {
return null;
}
const timeRemaining = timeRemainingString(intl, new Date(poll.get('expires_at')), intl.now());
const showResults = poll.get('voted') || poll.get('expired');
const disabled = this.props.disabled || Object.entries(this.state.selected).every(item => !item);
return (
<div className='poll'>

Loading…
Cancel
Save