diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-06-15 20:51:39 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-06-15 20:51:39 +0200 |
commit | db200226b805db324a8efdfb951d7725eac3f9da (patch) | |
tree | a7d8298fc65bbd81e2f843048240de6e4fceffcf /app/javascript/mastodon/features/direct_timeline/components/column_settings.js | |
parent | afceef74c2377192f100b9307068895ec0ec7d45 (diff) | |
parent | 0df91c7b1e05952ebbfc552915e995d55af0a403 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/javascript/mastodon/initial_state.js db/schema.rb Upstream added a new field to initial_state. Not too sure about what happened with db/schema.rb though…
Diffstat (limited to 'app/javascript/mastodon/features/direct_timeline/components/column_settings.js')
-rw-r--r-- | app/javascript/mastodon/features/direct_timeline/components/column_settings.js | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/app/javascript/mastodon/features/direct_timeline/components/column_settings.js b/app/javascript/mastodon/features/direct_timeline/components/column_settings.js new file mode 100644 index 000000000..a992b27bb --- /dev/null +++ b/app/javascript/mastodon/features/direct_timeline/components/column_settings.js @@ -0,0 +1,35 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import ImmutablePropTypes from 'react-immutable-proptypes'; +import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; +import SettingText from '../../../components/setting_text'; + +const messages = defineMessages({ + filter_regex: { id: 'home.column_settings.filter_regex', defaultMessage: 'Filter out by regular expressions' }, + settings: { id: 'home.settings', defaultMessage: 'Column settings' }, +}); + +@injectIntl +export default class ColumnSettings extends React.PureComponent { + + static propTypes = { + settings: ImmutablePropTypes.map.isRequired, + onChange: PropTypes.func.isRequired, + intl: PropTypes.object.isRequired, + }; + + render () { + const { settings, onChange, intl } = this.props; + + return ( + <div> + <span className='column-settings__section'><FormattedMessage id='home.column_settings.advanced' defaultMessage='Advanced' /></span> + + <div className='column-settings__row'> + <SettingText settings={settings} settingKey={['regex', 'body']} onChange={onChange} label={intl.formatMessage(messages.filter_regex)} /> + </div> + </div> + ); + } + +} |