Commit 882f814e authored by Yamagishi Kazutoshi's avatar Yamagishi Kazutoshi Committed by GitHub
Browse files

Remove legacy decorators syntax

parent f804c009
Showing with 40 additions and 28 deletions
+40 -28
......@@ -28,8 +28,6 @@ const mapStateToProps = state => ({
domain: state.getIn(['meta', 'domain']),
});
export default @connect(mapStateToProps)
@injectIntl
class Directory extends React.PureComponent {
static contextTypes = {
......@@ -170,3 +168,5 @@ class Directory extends React.PureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(Directory));
......@@ -22,8 +22,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['domain_lists', 'blocks', 'next']),
});
export default @connect(mapStateToProps)
@injectIntl
class Blocks extends ImmutablePureComponent {
static propTypes = {
......@@ -75,3 +73,5 @@ class Blocks extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(Blocks));
......@@ -22,8 +22,6 @@ const mapStateToProps = state => ({
isSearching: state.getIn(['search', 'submitted']),
});
export default @connect(mapStateToProps)
@injectIntl
class Explore extends React.PureComponent {
static contextTypes = {
......@@ -89,3 +87,5 @@ class Explore extends React.PureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(Explore));
......@@ -11,7 +11,6 @@ const mapStateToProps = state => ({
isLoading: state.getIn(['trends', 'links', 'isLoading']),
});
export default @connect(mapStateToProps)
class Links extends React.PureComponent {
static propTypes = {
......@@ -46,3 +45,5 @@ class Links extends React.PureComponent {
}
}
export default connect(mapStateToProps)(Links);
......@@ -36,7 +36,6 @@ const renderStatuses = (results, onLoadMore) => appendLoadMore('statuses', resul
<Status key={`status-${item}`} id={item} />
)), onLoadMore);
export default @connect(mapStateToProps)
class Results extends React.PureComponent {
static propTypes = {
......@@ -111,3 +110,5 @@ class Results extends React.PureComponent {
}
}
export default connect(mapStateToProps)(Results);
......@@ -13,7 +13,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['status_lists', 'trending', 'next']),
});
export default @connect(mapStateToProps)
class Statuses extends React.PureComponent {
static propTypes = {
......@@ -55,3 +54,5 @@ class Statuses extends React.PureComponent {
}
}
export default connect(mapStateToProps)(Statuses);
......@@ -11,7 +11,6 @@ const mapStateToProps = state => ({
isLoading: state.getIn(['suggestions', 'isLoading']),
});
export default @connect(mapStateToProps)
class Suggestions extends React.PureComponent {
static propTypes = {
......@@ -38,3 +37,5 @@ class Suggestions extends React.PureComponent {
}
}
export default connect(mapStateToProps)(Suggestions);
......@@ -11,7 +11,6 @@ const mapStateToProps = state => ({
isLoadingHashtags: state.getIn(['trends', 'tags', 'isLoading']),
});
export default @connect(mapStateToProps)
class Tags extends React.PureComponent {
static propTypes = {
......@@ -38,3 +37,5 @@ class Tags extends React.PureComponent {
}
}
export default connect(mapStateToProps)(Tags);
......@@ -21,8 +21,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['status_lists', 'favourites', 'next']),
});
export default @connect(mapStateToProps)
@injectIntl
class Favourites extends ImmutablePureComponent {
static propTypes = {
......@@ -100,3 +98,5 @@ class Favourites extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(Favourites));
......@@ -20,8 +20,6 @@ const mapStateToProps = (state, props) => ({
accountIds: state.getIn(['user_lists', 'favourited_by', props.params.statusId]),
});
export default @connect(mapStateToProps)
@injectIntl
class Favourites extends ImmutablePureComponent {
static propTypes = {
......@@ -85,3 +83,5 @@ class Favourites extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(Favourites));
......@@ -32,8 +32,6 @@ const getFirstSentence = str => {
return arr[0];
};
export default @connect(makeMapStateToProps)
@injectIntl
class Account extends ImmutablePureComponent {
static propTypes = {
......@@ -83,3 +81,5 @@ class Account extends ImmutablePureComponent {
}
}
export default connect(makeMapStateToProps)(injectIntl(Account));
......@@ -19,7 +19,6 @@ const mapStateToProps = state => ({
isLoading: state.getIn(['suggestions', 'isLoading']),
});
export default @connect(mapStateToProps)
class FollowRecommendations extends ImmutablePureComponent {
static contextTypes = {
......@@ -107,3 +106,5 @@ class FollowRecommendations extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(FollowRecommendations);
......@@ -13,7 +13,6 @@ const messages = defineMessages({
reject: { id: 'follow_request.reject', defaultMessage: 'Reject' },
});
export default @injectIntl
class AccountAuthorize extends ImmutablePureComponent {
static propTypes = {
......@@ -47,3 +46,5 @@ class AccountAuthorize extends ImmutablePureComponent {
}
}
export default injectIntl(AccountAuthorize);
......@@ -25,8 +25,6 @@ const mapStateToProps = state => ({
domain: state.getIn(['meta', 'domain']),
});
export default @connect(mapStateToProps)
@injectIntl
class FollowRequests extends ImmutablePureComponent {
static propTypes = {
......@@ -92,3 +90,5 @@ class FollowRequests extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(FollowRequests));
......@@ -53,7 +53,6 @@ RemoteHint.propTypes = {
url: PropTypes.string.isRequired,
};
export default @connect(mapStateToProps)
class Followers extends ImmutablePureComponent {
static propTypes = {
......@@ -167,3 +166,5 @@ class Followers extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(Followers);
......@@ -53,7 +53,6 @@ RemoteHint.propTypes = {
url: PropTypes.string.isRequired,
};
export default @connect(mapStateToProps)
class Following extends ImmutablePureComponent {
static propTypes = {
......@@ -167,3 +166,5 @@ class Following extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(Following);
......@@ -356,7 +356,6 @@ class Announcement extends ImmutablePureComponent {
}
export default @injectIntl
class Announcements extends ImmutablePureComponent {
static propTypes = {
......@@ -448,3 +447,5 @@ class Announcements extends ImmutablePureComponent {
}
}
export default injectIntl(Announcements);
......@@ -60,8 +60,6 @@ const badgeDisplay = (number, limit) => {
const NAVIGATION_PANEL_BREAKPOINT = 600 + (285 * 2) + (10 * 2);
export default @connect(mapStateToProps, mapDispatchToProps)
@injectIntl
class GettingStarted extends ImmutablePureComponent {
static contextTypes = {
......@@ -180,3 +178,5 @@ class GettingStarted extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(GettingStarted));
......@@ -12,7 +12,6 @@ const messages = defineMessages({
noOptions: { id: 'hashtag.column_settings.select.no_options_message', defaultMessage: 'No suggestions found' },
});
export default @injectIntl
class ColumnSettings extends React.PureComponent {
static propTypes = {
......@@ -131,3 +130,5 @@ class ColumnSettings extends React.PureComponent {
}
}
export default injectIntl(ColumnSettings);
......@@ -15,7 +15,6 @@ const mapStateToProps = (state, props) => ({
hasUnread: state.getIn(['timelines', `hashtag:${props.params.id}${props.params.local ? ':local' : ''}`, 'unread']) > 0,
});
export default @connect(mapStateToProps)
class HashtagTimeline extends React.PureComponent {
disconnects = [];
......@@ -162,3 +161,5 @@ class HashtagTimeline extends React.PureComponent {
}
}
export default connect(mapStateToProps)(HashtagTimeline);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment