diff options
author | ThibG <thib@sitedethib.com> | 2020-07-07 16:21:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-07 16:21:42 +0200 |
commit | c4e1b82caf5c932a3c19bc77726c9e3ab3d2c46a (patch) | |
tree | 432bd5bc0c7ec19aac3175150e397b5336c71a4d /app/javascript/flavours/glitch/features/hashtag_timeline | |
parent | 94e09d309cb068ea92919767e40e655260ac43cb (diff) | |
parent | 6c7ac1b48f7d4c6d0a1e0cf7f663c3188421d7c7 (diff) |
Merge pull request #1373 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/hashtag_timeline')
-rw-r--r-- | app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.js | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.js b/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.js index 956f16734..27300f020 100644 --- a/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.js +++ b/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.js @@ -4,6 +4,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import Toggle from 'react-toggle'; import AsyncSelect from 'react-select/async'; +import { NonceProvider } from 'react-select'; import SettingToggle from '../../notifications/components/setting_toggle'; const messages = defineMessages({ @@ -58,18 +59,20 @@ class ColumnSettings extends React.PureComponent { {this.modeLabel(mode)} </span> - <AsyncSelect - isMulti - autoFocus - value={this.tags(mode)} - onChange={this.onSelect(mode)} - loadOptions={this.props.onLoad} - className='column-select__container' - classNamePrefix='column-select' - name='tags' - placeholder={this.props.intl.formatMessage(messages.placeholder)} - noOptionsMessage={this.noOptionsMessage} - /> + <NonceProvider nonce={document.querySelector('meta[name=style-nonce]').content}> + <AsyncSelect + isMulti + autoFocus + value={this.tags(mode)} + onChange={this.onSelect(mode)} + loadOptions={this.props.onLoad} + className='column-select__container' + classNamePrefix='column-select' + name='tags' + placeholder={this.props.intl.formatMessage(messages.placeholder)} + noOptionsMessage={this.noOptionsMessage} + /> + </NonceProvider> </div> ); } |