diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-01-25 21:58:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-25 21:58:31 +0100 |
commit | 7acf26e7778f8bb2b62c61904547dec75723c203 (patch) | |
tree | 036948c5d0eb01bf9ae18d612d965ac9c9b89fae /app/javascript/flavours/glitch/features/compose/components | |
parent | 368d6fe54f94ad2ecd2a1c1e7e5a2359dc37ad30 (diff) | |
parent | 20934363492db6a33bf89726444c7a41eaa8d854 (diff) |
Merge pull request #2094 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/compose/components')
-rw-r--r-- | app/javascript/flavours/glitch/features/compose/components/compose_form.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/features/compose/components/compose_form.js b/app/javascript/flavours/glitch/features/compose/components/compose_form.js index 0462c7c4b..2b57cf15d 100644 --- a/app/javascript/flavours/glitch/features/compose/components/compose_form.js +++ b/app/javascript/flavours/glitch/features/compose/components/compose_form.js @@ -61,6 +61,7 @@ class ComposeForm extends ImmutablePureComponent { anyMedia: PropTypes.bool, isInReply: PropTypes.bool, singleColumn: PropTypes.bool, + lang: PropTypes.string, advancedOptions: ImmutablePropTypes.map, layout: PropTypes.string, @@ -325,6 +326,7 @@ class ComposeForm extends ImmutablePureComponent { searchTokens={[':']} id='glitch.composer.spoiler.input' className='spoiler-input__input' + lang={this.props.lang} autoFocus={false} /> </div> @@ -343,6 +345,7 @@ class ComposeForm extends ImmutablePureComponent { onSuggestionSelected={this.onSuggestionSelected} onPaste={onPaste} autoFocus={!showSearch && !isMobile(window.innerWidth, layout)} + lang={this.props.lang} > <EmojiPickerDropdown onPickEmoji={handleEmojiPick} /> <TextareaIcons advancedOptions={advancedOptions} /> |