From fda5c699c2d1165381da87ffe12ebc92e6529f47 Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Fri, 2 Jun 2017 00:25:10 +0900 Subject: [PATCH] Add ESLint rule (object-curly-spacing) (#3498) --- .eslintrc.yml | 3 +++ app/javascript/mastodon/components/avatar_overlay.js | 2 +- .../compose/components/emoji_picker_dropdown.js | 10 +++++----- .../mastodon/features/getting_started/index.js | 4 ++-- .../mastodon/features/ui/components/image_loader.js | 6 +++--- .../mastodon/features/ui/components/media_modal.js | 4 ++-- .../features/ui/components/onboarding_modal.js | 2 +- .../features/ui/containers/status_list_container.js | 2 +- config/webpack/translationRunner.js | 2 +- 9 files changed, 19 insertions(+), 16 deletions(-) diff --git a/.eslintrc.yml b/.eslintrc.yml index 59218cb24d3..8d1bbc43a70 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -54,6 +54,9 @@ rules: comma-dangle: - error - always-multiline + object-curly-spacing: + - error + - always react/jsx-wrap-multilines: error react/jsx-no-bind: error diff --git a/app/javascript/mastodon/components/avatar_overlay.js b/app/javascript/mastodon/components/avatar_overlay.js index a9643499d3a..e41d66ab104 100644 --- a/app/javascript/mastodon/components/avatar_overlay.js +++ b/app/javascript/mastodon/components/avatar_overlay.js @@ -9,7 +9,7 @@ class AvatarOverlay extends React.PureComponent { }; render() { - const {staticSrc, overlaySrc} = this.props; + const { staticSrc, overlaySrc } = this.props; const baseStyle = { backgroundImage: `url(${staticSrc})`, diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js index fc921dfb801..ffe5a1bcdf3 100644 --- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js +++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js @@ -46,21 +46,21 @@ class EmojiPickerDropdown extends React.PureComponent { } onShowDropdown = () => { - this.setState({active: true}); + this.setState({ active: true }); if (!EmojiPicker) { - this.setState({loading: true}); + this.setState({ loading: true }); import(/* webpackChunkName: "emojione_picker" */ 'emojione-picker').then(TheEmojiPicker => { EmojiPicker = TheEmojiPicker.default; - this.setState({loading: false}); + this.setState({ loading: false }); }).catch(err => { // TODO: show the user an error? - this.setState({loading: false}); + this.setState({ loading: false }); }); } } onHideDropdown = () => { - this.setState({active: false}); + this.setState({ active: false }); } render () { diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js index d1123878e23..f9619550cd0 100644 --- a/app/javascript/mastodon/features/getting_started/index.js +++ b/app/javascript/mastodon/features/getting_started/index.js @@ -12,8 +12,8 @@ import ImmutablePureComponent from 'react-immutable-pure-component'; const messages = defineMessages({ heading: { id: 'getting_started.heading', defaultMessage: 'Getting started' }, public_timeline: { id: 'navigation_bar.public_timeline', defaultMessage: 'Federated timeline' }, - navigation_subheading: { id: 'column_subheading.navigation', defaultMessage: 'Navigation'}, - settings_subheading: { id: 'column_subheading.settings', defaultMessage: 'Settings'}, + navigation_subheading: { id: 'column_subheading.navigation', defaultMessage: 'Navigation' }, + settings_subheading: { id: 'column_subheading.settings', defaultMessage: 'Settings' }, community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' }, preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' }, follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' }, diff --git a/app/javascript/mastodon/features/ui/components/image_loader.js b/app/javascript/mastodon/features/ui/components/image_loader.js index af2870517ef..2a2cbb9bf1d 100644 --- a/app/javascript/mastodon/features/ui/components/image_loader.js +++ b/app/javascript/mastodon/features/ui/components/image_loader.js @@ -22,11 +22,11 @@ class ImageLoader extends React.PureComponent { loadImage(src) { const image = new Image(); - image.onerror = () => this.setState({loading: false, error: true}); - image.onload = () => this.setState({loading: false, error: false}); + image.onerror = () => this.setState({ loading: false, error: true }); + image.onload = () => this.setState({ loading: false, error: false }); image.src = src; this.lastSrc = src; - this.setState({loading: true}); + this.setState({ loading: true }); } render() { diff --git a/app/javascript/mastodon/features/ui/components/media_modal.js b/app/javascript/mastodon/features/ui/components/media_modal.js index effa0aea3be..4f27a0f7231 100644 --- a/app/javascript/mastodon/features/ui/components/media_modal.js +++ b/app/javascript/mastodon/features/ui/components/media_modal.js @@ -26,11 +26,11 @@ class MediaModal extends ImmutablePureComponent { }; handleNextClick = () => { - this.setState({ index: (this.getIndex() + 1) % this.props.media.size}); + this.setState({ index: (this.getIndex() + 1) % this.props.media.size }); } handlePrevClick = () => { - this.setState({ index: (this.getIndex() - 1) % this.props.media.size}); + this.setState({ index: (this.getIndex() - 1) % this.props.media.size }); } handleKeyUp = (e) => { diff --git a/app/javascript/mastodon/features/ui/components/onboarding_modal.js b/app/javascript/mastodon/features/ui/components/onboarding_modal.js index cc3c0cdc5ca..a06338b25a8 100644 --- a/app/javascript/mastodon/features/ui/components/onboarding_modal.js +++ b/app/javascript/mastodon/features/ui/components/onboarding_modal.js @@ -139,7 +139,7 @@ const PageSix = ({ admin, domain }) => {

@{admin.get('acct')} }} />
- }}/> + }}/>

); } diff --git a/app/javascript/mastodon/features/ui/containers/status_list_container.js b/app/javascript/mastodon/features/ui/containers/status_list_container.js index 14222fedd90..cbdd2d12d43 100644 --- a/app/javascript/mastodon/features/ui/containers/status_list_container.js +++ b/app/javascript/mastodon/features/ui/containers/status_list_container.js @@ -56,7 +56,7 @@ const mapDispatchToProps = (dispatch, { type, id }) => ({ onScrollToBottom: debounce(() => { dispatch(scrollTopTimeline(type, false)); dispatch(expandTimeline(type, id)); - }, 300, {leading: true}), + }, 300, { leading: true }), onScrollToTop: debounce(() => { dispatch(scrollTopTimeline(type, true)); diff --git a/config/webpack/translationRunner.js b/config/webpack/translationRunner.js index 8d2fb4893d2..a546125494c 100644 --- a/config/webpack/translationRunner.js +++ b/config/webpack/translationRunner.js @@ -35,7 +35,7 @@ const validateLanguages = function (languages, validators) { if (invalidLanguages.length > 0) { console.log(`\nError: Specified invalid LANGUAGES:`); - for (let {language, error} of invalidLanguages) { + for (let { language, error } of invalidLanguages) { console.error(`* ${language}: ${error}`); } console.log(`\nUse yarn "manage:translations -- --help" for usage information\n`);