about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/features/composer
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-03-16 22:59:47 +0100
committerGitHub <noreply@github.com>2019-03-16 22:59:47 +0100
commit6e3a4bcbc70bb33bfb0746cf3b2186ee9f4e6515 (patch)
tree239e6c3779ce64ee9833c3eec761ea158c2813b3 /app/javascript/flavours/glitch/features/composer
parent6af2300454c960ef83f7b7d31e9b829e0d5a8e38 (diff)
parent8ea344fed40ae1dccf5e1b6ecfd0014128c10fb7 (diff)
Merge pull request #962 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/composer')
-rw-r--r--app/javascript/flavours/glitch/features/composer/poll_form/components/poll_form.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/composer/poll_form/components/poll_form.js b/app/javascript/flavours/glitch/features/composer/poll_form/components/poll_form.js
index 7ee28e304..1915b62d5 100644
--- a/app/javascript/flavours/glitch/features/composer/poll_form/components/poll_form.js
+++ b/app/javascript/flavours/glitch/features/composer/poll_form/components/poll_form.js
@@ -51,7 +51,7 @@ class Option extends React.PureComponent {
           <input
             type='text'
             placeholder={intl.formatMessage(messages.option_placeholder, { number: index + 1 })}
-            maxlength={pollLimits.max_option_chars}
+            maxLength={pollLimits.max_option_chars}
             value={title}
             onChange={this.handleOptionTitleChange}
           />