Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add ESLint rule (object-curly-spacing) (#3498)

Browse source
This commit is contained in:
Yamagishi Kazutoshi 2017-06-02 00:25:10 +09:00 • committed by Eugen Rochko
parent cb7ee4698f
commit fda5c699c2
9 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
View file

@ -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 () {

4
app/javascript/mastodon/features/getting_started/index.js
View file

@ -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' },

6
app/javascript/mastodon/features/ui/components/image_loader.js
View file

@ -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() {

4
app/javascript/mastodon/features/ui/components/media_modal.js
View file

@ -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) => {

2
app/javascript/mastodon/features/ui/components/onboarding_modal.js
View file

@ -139,7 +139,7 @@ const PageSix = ({ admin, domain }) => {
<p>
<FormattedMessage id='onboarding.page_six.admin' defaultMessage="Your instance's admin is {admin}." values={{ admin: <Permalink href={admin.get('url')} to={`/accounts/${admin.get('id')}`}>@{admin.get('acct')}</Permalink> }} />
<br />
<FormattedMessage id='onboarding.page_six.read_guidelines' defaultMessage="Please read {domain}'s {guidelines}!" values={{domain, guidelines: <a href='/about/more' target='_blank'><FormattedMessage id='onboarding.page_six.guidelines' defaultMessage='community guidelines' /></a> }}/>
<FormattedMessage id='onboarding.page_six.read_guidelines' defaultMessage="Please read {domain}'s {guidelines}!" values={{ domain, guidelines: <a href='/about/more' target='_blank'><FormattedMessage id='onboarding.page_six.guidelines' defaultMessage='community guidelines' /></a> }}/>
</p>
);
}

2
app/javascript/mastodon/features/ui/containers/status_list_container.js
View file

@ -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));