From: Thibaut Girka <thib@sitedethib.com>
Date: Sat, 23 Nov 2019 18:03:01 +0000 (+0100)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=c0f7e21685bbb6b40fdb6f042b8a7ec1054178f2;p=mastodon.git

Merge branch 'master' into glitch-soc/merge-upstream
---

c0f7e21685bbb6b40fdb6f042b8a7ec1054178f2
diff --cc app/javascript/mastodon/features/compose/components/poll_form.js
index 923f1029f,f4cd71a76..7dac950b1
--- a/app/javascript/mastodon/features/compose/components/poll_form.js
+++ b/app/javascript/mastodon/features/compose/components/poll_form.js
@@@ -142,9 -142,9 +142,9 @@@ class PollForm extends ImmutablePureCom
          </ul>
  
          <div className='poll__footer'>
 -          <button disabled={options.size >= 4} className='button button-secondary' onClick={this.handleAddOption}><Icon id='plus' /> <FormattedMessage {...messages.add_option} /></button>
 +          <button disabled={options.size >= 5} className='button button-secondary' onClick={this.handleAddOption}><Icon id='plus' /> <FormattedMessage {...messages.add_option} /></button>
  
-           <select value={expiresIn} onChange={this.handleSelectDuration}>
+           <select value={expiresIn} onBlur={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>