Otherkin.Club
/
mastodon
1
0
Fork 0
Code Issues Releases Activity

bump poll sizes to 33 options x 202 chars

master
multiple creatures 2019-07-26 17:30:16 +00:00
parent 0d17c2bf2e
commit 5c27502afa
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/features/compose/components/poll_form.js
View File

@ -77,7 +77,7 @@ class Option extends React.PureComponent {
<AutosuggestInput <AutosuggestInput
placeholder={intl.formatMessage(messages.option_placeholder, { number: index + 1 })} placeholder={intl.formatMessage(messages.option_placeholder, { number: index + 1 })}
maxlength={111} maxlength={202}
value={title} value={title}
onChange={this.handleOptionTitleChange} onChange={this.handleOptionTitleChange}
suggestions={this.props.suggestions} suggestions={this.props.suggestions}
@ -142,7 +142,7 @@ class PollForm extends ImmutablePureComponent {
</ul> </ul>
<div className='poll__footer'> <div className='poll__footer'>
{options.size < 6 && ( {options.size < 33 && (
<button className='button button-secondary' onClick={this.handleAddOption}><Icon id='plus' /> <FormattedMessage {...messages.add_option} /></button> <button className='button button-secondary' onClick={this.handleAddOption}><Icon id='plus' /> <FormattedMessage {...messages.add_option} /></button>
)} )}

4
app/validators/poll_validator.rb
View File

@ -1,8 +1,8 @@
# frozen_string_literal: true # frozen_string_literal: true
class PollValidator < ActiveModel::Validator class PollValidator < ActiveModel::Validator
MAX_OPTIONS = 6 MAX_OPTIONS = 33
MAX_OPTION_CHARS = 111 MAX_OPTION_CHARS = 202
MAX_EXPIRATION = 6.months.freeze MAX_EXPIRATION = 6.months.freeze
MIN_EXPIRATION = 1.minute.freeze MIN_EXPIRATION = 1.minute.freeze