diff options
author | Yamagishi Kazutoshi <ykzts@desire.sh> | 2017-05-21 00:31:47 +0900 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-20 17:31:47 +0200 |
commit | 2e112e240666b62b8c3d4fa201fb24b841f6c92b (patch) | |
tree | f95f2eb5ae8156c10bf16894919d0ba5e3f34096 /app/javascript/mastodon/features/home_timeline | |
parent | 812fe90ecaef58f1dbe16c3fdfea79e14e7bbc9d (diff) |
Improve eslint rules (#3147)
* Add semi to ESLint rules * Add padded-blocks to ESLint rules * Add comma-dangle to ESLint rules * add config/webpack and storyboard * add streaming/ * yarn test:lint -- --fix
Diffstat (limited to 'app/javascript/mastodon/features/home_timeline')
4 files changed, 10 insertions, 10 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 96cade870..094053aa8 100644 --- a/app/javascript/mastodon/features/home_timeline/components/column_settings.js +++ b/app/javascript/mastodon/features/home_timeline/components/column_settings.js @@ -8,7 +8,7 @@ import SettingText from './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' } + settings: { id: 'home.settings', defaultMessage: 'Column settings' }, }); class ColumnSettings extends React.PureComponent { @@ -17,7 +17,7 @@ class ColumnSettings extends React.PureComponent { settings: ImmutablePropTypes.map.isRequired, onChange: PropTypes.func.isRequired, onSave: PropTypes.func.isRequired, - intl: PropTypes.object.isRequired + intl: PropTypes.object.isRequired, }; render () { diff --git a/app/javascript/mastodon/features/home_timeline/components/setting_text.js b/app/javascript/mastodon/features/home_timeline/components/setting_text.js index a872ae76f..d4f177f8a 100644 --- a/app/javascript/mastodon/features/home_timeline/components/setting_text.js +++ b/app/javascript/mastodon/features/home_timeline/components/setting_text.js @@ -8,11 +8,11 @@ class SettingText extends React.PureComponent { settings: ImmutablePropTypes.map.isRequired, settingKey: PropTypes.array.isRequired, label: PropTypes.string.isRequired, - onChange: PropTypes.func.isRequired + onChange: PropTypes.func.isRequired, }; handleChange = (e) => { - this.props.onChange(this.props.settingKey, e.target.value) + this.props.onChange(this.props.settingKey, e.target.value); } render () { diff --git a/app/javascript/mastodon/features/home_timeline/containers/column_settings_container.js b/app/javascript/mastodon/features/home_timeline/containers/column_settings_container.js index 3b3ce19bc..fd8a39298 100644 --- a/app/javascript/mastodon/features/home_timeline/containers/column_settings_container.js +++ b/app/javascript/mastodon/features/home_timeline/containers/column_settings_container.js @@ -3,7 +3,7 @@ import ColumnSettings from '../components/column_settings'; import { changeSetting, saveSettings } from '../../../actions/settings'; const mapStateToProps = state => ({ - settings: state.getIn(['settings', 'home']) + settings: state.getIn(['settings', 'home']), }); const mapDispatchToProps = dispatch => ({ @@ -14,7 +14,7 @@ const mapDispatchToProps = dispatch => ({ onSave () { dispatch(saveSettings()); - } + }, }); diff --git a/app/javascript/mastodon/features/home_timeline/index.js b/app/javascript/mastodon/features/home_timeline/index.js index a44ba6882..8f03adb12 100644 --- a/app/javascript/mastodon/features/home_timeline/index.js +++ b/app/javascript/mastodon/features/home_timeline/index.js @@ -8,12 +8,12 @@ import ColumnSettingsContainer from './containers/column_settings_container'; import Link from 'react-router/lib/Link'; const messages = defineMessages({ - title: { id: 'column.home', defaultMessage: 'Home' } + title: { id: 'column.home', defaultMessage: 'Home' }, }); const mapStateToProps = state => ({ hasUnread: state.getIn(['timelines', 'home', 'unread']) > 0, - hasFollows: state.getIn(['accounts_counters', state.getIn(['meta', 'me']), 'following_count']) > 0 + hasFollows: state.getIn(['accounts_counters', state.getIn(['meta', 'me']), 'following_count']) > 0, }); class HomeTimeline extends React.PureComponent { @@ -21,7 +21,7 @@ class HomeTimeline extends React.PureComponent { static propTypes = { intl: PropTypes.object.isRequired, hasUnread: PropTypes.bool, - hasFollows: PropTypes.bool + hasFollows: PropTypes.bool, }; render () { @@ -30,7 +30,7 @@ class HomeTimeline extends React.PureComponent { let emptyMessage; if (hasFollows) { - emptyMessage = <FormattedMessage id='empty_column.home.inactivity' defaultMessage="Your home feed is empty. If you have been inactive for a while, it will be regenerated for you soon." /> + emptyMessage = <FormattedMessage id='empty_column.home.inactivity' defaultMessage="Your home feed is empty. If you have been inactive for a while, it will be regenerated for you soon." />; } else { emptyMessage = <FormattedMessage id='empty_column.home' defaultMessage="You aren't following anyone yet. Visit {public} or use search to get started and meet other users." values={{ public: <Link to='/timelines/public'><FormattedMessage id='empty_column.home.public_timeline' defaultMessage='the public timeline' /></Link> }} />; } |