diff options
author | ふぁぼ原 <ko_kurihara@yahoo.co.jp> | 2017-06-06 23:56:10 +0900 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-06-06 16:56:10 +0200 |
commit | 7623766241862d2ede47558639c357d57b769e3b (patch) | |
tree | 3211cfa0d57173b8ced269871a32bf07c4ce36f0 /app/javascript/mastodon/features/home_timeline | |
parent | e34c5a350321c6c1997bdcc15fbd85cfb521f51b (diff) |
Add regex filters on the community timeline and the public timeline. (#3564)
* Add regex filter on the community timeline and the public timeline * correcting * Adjust the height of header buttons * Remove trailing spaces * Remove trailing spaces * Solve some code duplication * reset the state of the locale files in app/javascript/mastodon/locales * adjust to upstream * adjust to upstream * change keys of locale settings
Diffstat (limited to 'app/javascript/mastodon/features/home_timeline')
-rw-r--r-- | app/javascript/mastodon/features/home_timeline/components/column_settings.js | 2 | ||||
-rw-r--r-- | app/javascript/mastodon/features/home_timeline/components/setting_text.js | 33 |
2 files changed, 1 insertions, 34 deletions
diff --git a/app/javascript/mastodon/features/home_timeline/components/column_settings.js b/app/javascript/mastodon/features/home_timeline/components/column_settings.js index 902c7a06c..104d8ff37 100644 --- a/app/javascript/mastodon/features/home_timeline/components/column_settings.js +++ b/app/javascript/mastodon/features/home_timeline/components/column_settings.js @@ -4,7 +4,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import ColumnCollapsable from '../../../components/column_collapsable'; import SettingToggle from '../../notifications/components/setting_toggle'; -import SettingText from './setting_text'; +import SettingText from '../../../components/setting_text'; const messages = defineMessages({ filter_regex: { id: 'home.column_settings.filter_regex', defaultMessage: 'Filter out by regular expressions' }, diff --git a/app/javascript/mastodon/features/home_timeline/components/setting_text.js b/app/javascript/mastodon/features/home_timeline/components/setting_text.js deleted file mode 100644 index d4f177f8a..000000000 --- a/app/javascript/mastodon/features/home_timeline/components/setting_text.js +++ /dev/null @@ -1,33 +0,0 @@ -import React from 'react'; -import PropTypes from 'prop-types'; -import ImmutablePropTypes from 'react-immutable-proptypes'; - -class SettingText extends React.PureComponent { - - static propTypes = { - settings: ImmutablePropTypes.map.isRequired, - settingKey: PropTypes.array.isRequired, - label: PropTypes.string.isRequired, - onChange: PropTypes.func.isRequired, - }; - - handleChange = (e) => { - this.props.onChange(this.props.settingKey, e.target.value); - } - - render () { - const { settings, settingKey, label } = this.props; - - return ( - <input - className='setting-text' - value={settings.getIn(settingKey)} - onChange={this.handleChange} - placeholder={label} - /> - ); - } - -} - -export default SettingText; |