diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-12-12 15:40:06 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-12-12 15:40:06 +0100 |
| commit | be4849c08306cce930ea27e1f8097ffb774f75c6 (patch) | |
| tree | 7eb7528245c671cdf908e07c3d630e7639d575bb /app/javascript/mastodon/features/compose | |
| parent | 246addd5b33a172600342af3fb6fb5e4c80ad95e (diff) | |
| parent | d08a4979462352f83b1deddaa6209f7b6078ed26 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/application_controller.rb Minor conflict due to glitch-soc's theming system
Diffstat (limited to 'app/javascript/mastodon/features/compose')
| -rw-r--r-- | app/javascript/mastodon/features/compose/components/poll_form.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/compose/components/poll_form.js b/app/javascript/mastodon/features/compose/components/poll_form.js index 791a4b1ad..ba245f4d3 100644 --- a/app/javascript/mastodon/features/compose/components/poll_form.js +++ b/app/javascript/mastodon/features/compose/components/poll_form.js @@ -155,7 +155,7 @@ class PollForm extends ImmutablePureComponent { <div className='poll__footer'> <button disabled={options.size >= 5} className='button button-secondary' onClick={this.handleAddOption}><Icon id='plus' /> <FormattedMessage {...messages.add_option} /></button> - <select value={expiresIn} onBlur={this.handleSelectDuration}> + <select value={expiresIn} onChange={this.handleSelectDuration}> <option value={300}>{intl.formatMessage(messages.minutes, { number: 5 })}</option> <option value={1800}>{intl.formatMessage(messages.minutes, { number: 30 })}</option> <option value={3600}>{intl.formatMessage(messages.hours, { number: 1 })}</option> |