diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-04-20 16:45:40 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-04-20 16:45:40 +0200 |
commit | 63dc7cfa904d83b92151597aa745963996a9c926 (patch) | |
tree | 1cf2d3225374c6d8f55bcf1c36f0b4ce5aee0911 /app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js | |
parent | d5530827c984238f93100ee737ed209d61e316c0 (diff) | |
parent | f2cf91277119c63044bdd45e599f37dc829b6eb2 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js')
-rw-r--r-- | app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js b/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js index 9c39b158a..956f16734 100644 --- a/app/javascript/mastodon/features/hashtag_timeline/components/column_settings.js +++ b/app/javascript/mastodon/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 SettingToggle from '../../notifications/components/setting_toggle'; const messages = defineMessages({ placeholder: { id: 'hashtag.column_settings.select.placeholder', defaultMessage: 'Enter hashtags…' }, @@ -87,6 +88,8 @@ class ColumnSettings extends React.PureComponent { }; render () { + const { settings, onChange } = this.props; + return ( <div> <div className='column-settings__row'> @@ -106,6 +109,10 @@ class ColumnSettings extends React.PureComponent { {this.modeSelect('none')} </div> )} + + <div className='column-settings__row'> + <SettingToggle settings={settings} settingPath={['local']} onChange={onChange} label={<FormattedMessage id='community.column_settings.local_only' defaultMessage='Local only' />} /> + </div> </div> ); } |