M app/javascript/flavours/glitch/components/account.jsx => app/javascript/flavours/glitch/components/account.jsx +2 -1
@@ 23,7 23,6 @@ const messages = defineMessages({
block: { id: 'account.block', defaultMessage: 'Block @{name}' },
});
-export default @injectIntl
class Account extends ImmutablePureComponent {
static propTypes = {
@@ 184,3 183,5 @@ class Account extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Account);
M app/javascript/flavours/glitch/components/admin/ReportReasonSelector.jsx => app/javascript/flavours/glitch/components/admin/ReportReasonSelector.jsx +2 -1
@@ 84,7 84,6 @@ class Rule extends React.PureComponent {
}
-export default @injectIntl
class ReportReasonSelector extends React.PureComponent {
static propTypes = {
@@ 157,3 156,5 @@ class ReportReasonSelector extends React.PureComponent {
}
}
+
+export default injectIntl(ReportReasonSelector);
M app/javascript/flavours/glitch/components/column_header.jsx => app/javascript/flavours/glitch/components/column_header.jsx +2 -1
@@ 12,7 12,6 @@ const messages = defineMessages({
moveRight: { id: 'column_header.moveRight_settings', defaultMessage: 'Move column to the right' },
});
-export default @injectIntl
class ColumnHeader extends React.PureComponent {
static contextTypes = {
@@ 218,3 217,5 @@ class ColumnHeader extends React.PureComponent {
}
}
+
+export default injectIntl(ColumnHeader);
M app/javascript/flavours/glitch/components/dismissable_banner.jsx => app/javascript/flavours/glitch/components/dismissable_banner.jsx +2 -1
@@ 8,7 8,6 @@ const messages = defineMessages({
dismiss: { id: 'dismissable_banner.dismiss', defaultMessage: 'Dismiss' },
});
-export default @injectIntl
class DismissableBanner extends React.PureComponent {
static propTypes = {
@@ 49,3 48,5 @@ class DismissableBanner extends React.PureComponent {
}
}
+
+export default injectIntl(DismissableBanner);
M app/javascript/flavours/glitch/components/domain.jsx => app/javascript/flavours/glitch/components/domain.jsx +2 -1
@@ 8,7 8,6 @@ const messages = defineMessages({
unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
});
-export default @injectIntl
class Account extends ImmutablePureComponent {
static propTypes = {
@@ 40,3 39,5 @@ class Account extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Account);
M app/javascript/flavours/glitch/components/edited_timestamp/index.jsx => app/javascript/flavours/glitch/components/edited_timestamp/index.jsx +2 -2
@@ 16,8 16,6 @@ const mapDispatchToProps = (dispatch, { statusId }) => ({
});
-export default @connect(null, mapDispatchToProps)
-@injectIntl
class EditedTimestamp extends React.PureComponent {
static propTypes = {
@@ 68,3 66,5 @@ class EditedTimestamp extends React.PureComponent {
}
}
+
+export default connect(null, mapDispatchToProps)(injectIntl(EditedTimestamp));
M app/javascript/flavours/glitch/components/inline_account.jsx => app/javascript/flavours/glitch/components/inline_account.jsx +2 -1
@@ 14,7 14,6 @@ const makeMapStateToProps = () => {
return mapStateToProps;
};
-export default @connect(makeMapStateToProps)
class InlineAccount extends React.PureComponent {
static propTypes = {
@@ 32,3 31,5 @@ class InlineAccount extends React.PureComponent {
}
}
+
+export default connect(makeMapStateToProps)(InlineAccount);
M app/javascript/flavours/glitch/components/load_gap.jsx => app/javascript/flavours/glitch/components/load_gap.jsx +2 -1
@@ 7,7 7,6 @@ const messages = defineMessages({
load_more: { id: 'status.load_more', defaultMessage: 'Load more' },
});
-export default @injectIntl
class LoadGap extends React.PureComponent {
static propTypes = {
@@ 32,3 31,5 @@ class LoadGap extends React.PureComponent {
}
}
+
+export default injectIntl(LoadGap);
M app/javascript/flavours/glitch/components/media_gallery.jsx => app/javascript/flavours/glitch/components/media_gallery.jsx +2 -1
@@ 244,7 244,6 @@ class Item extends React.PureComponent {
}
-export default @injectIntl
class MediaGallery extends React.PureComponent {
static propTypes = {
@@ 406,3 405,5 @@ class MediaGallery extends React.PureComponent {
}
}
+
+export default injectIntl(MediaGallery);
M app/javascript/flavours/glitch/components/navigation_portal.jsx => app/javascript/flavours/glitch/components/navigation_portal.jsx +2 -1
@@ 15,7 15,6 @@ const DefaultNavigation = () => (
</>
);
-export default @withRouter
class NavigationPortal extends React.PureComponent {
render () {
@@ 33,3 32,5 @@ class NavigationPortal extends React.PureComponent {
}
}
+
+export default withRouter(NavigationPortal);
M app/javascript/flavours/glitch/components/notification_purge_buttons.jsx => app/javascript/flavours/glitch/components/notification_purge_buttons.jsx +2 -1
@@ 19,7 19,6 @@ const messages = defineMessages({
btnApply : { id: 'notification_purge.btn_apply', defaultMessage: 'Clear\nselected' },
});
-export default @injectIntl
class NotificationPurgeButtons extends ImmutablePureComponent {
static propTypes = {
@@ 57,3 56,5 @@ class NotificationPurgeButtons extends ImmutablePureComponent {
}
}
+
+export default injectIntl(NotificationPurgeButtons);
M app/javascript/flavours/glitch/components/picture_in_picture_placeholder.jsx => app/javascript/flavours/glitch/components/picture_in_picture_placeholder.jsx +2 -1
@@ 6,7 6,6 @@ import { connect } from 'react-redux';
import { debounce } from 'lodash';
import { FormattedMessage } from 'react-intl';
-export default @connect()
class PictureInPicturePlaceholder extends React.PureComponent {
static propTypes = {
@@ 67,3 66,5 @@ class PictureInPicturePlaceholder extends React.PureComponent {
}
}
+
+export default connect()(PictureInPicturePlaceholder);
M app/javascript/flavours/glitch/components/poll.jsx => app/javascript/flavours/glitch/components/poll.jsx +2 -1
@@ 31,7 31,6 @@ const makeEmojiMap = record => record.get('emojis').reduce((obj, emoji) => {
return obj;
}, {});
-export default @injectIntl
class Poll extends ImmutablePureComponent {
static contextTypes = {
@@ 234,3 233,5 @@ class Poll extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Poll);
M app/javascript/flavours/glitch/components/relative_timestamp.jsx => app/javascript/flavours/glitch/components/relative_timestamp.jsx +2 -1
@@ 121,7 121,6 @@ const timeRemainingString = (intl, date, now, timeGiven = true) => {
return relativeTime;
};
-export default @injectIntl
class RelativeTimestamp extends React.Component {
static propTypes = {
@@ 197,3 196,5 @@ class RelativeTimestamp extends React.Component {
}
}
+
+export default injectIntl(RelativeTimestamp);
M app/javascript/flavours/glitch/components/scrollable_list.jsx => app/javascript/flavours/glitch/components/scrollable_list.jsx +2 -1
@@ 20,7 20,6 @@ const mapStateToProps = (state, { scrollKey }) => {
};
};
-export default @connect(mapStateToProps, null, null, { forwardRef: true })
class ScrollableList extends PureComponent {
static contextTypes = {
@@ 352,3 351,5 @@ class ScrollableList extends PureComponent {
}
}
+
+export default connect(mapStateToProps, null, null, { forwardRef: true })(ScrollableList);
M app/javascript/flavours/glitch/components/server_banner.jsx => app/javascript/flavours/glitch/components/server_banner.jsx +2 -2
@@ 18,8 18,6 @@ const mapStateToProps = state => ({
server: state.getIn(['server', 'server']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class ServerBanner extends React.PureComponent {
static propTypes = {
@@ 91,3 89,5 @@ class ServerBanner extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(ServerBanner));
M app/javascript/flavours/glitch/components/status.jsx => app/javascript/flavours/glitch/components/status.jsx +2 -1
@@ 56,7 56,6 @@ export const defaultMediaVisibility = (status, settings) => {
return (displayMedia !== 'hide_all' && !status.get('sensitive') || displayMedia === 'show_all');
};
-export default @injectIntl
class Status extends ImmutablePureComponent {
static contextTypes = {
@@ 830,3 829,5 @@ class Status extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Status);
M app/javascript/flavours/glitch/components/status_action_bar.jsx => app/javascript/flavours/glitch/components/status_action_bar.jsx +2 -1
@@ 46,7 46,6 @@ const messages = defineMessages({
openOriginalPage: { id: 'account.open_original_page', defaultMessage: 'Open original page' },
});
-export default @injectIntl
class StatusActionBar extends ImmutablePureComponent {
static contextTypes = {
@@ 339,3 338,5 @@ class StatusActionBar extends ImmutablePureComponent {
}
}
+
+export default injectIntl(StatusActionBar);
M app/javascript/flavours/glitch/components/status_content.jsx => app/javascript/flavours/glitch/components/status_content.jsx +2 -2
@@ 104,8 104,6 @@ const mapStateToProps = state => ({
languages: state.getIn(['server', 'translationLanguages', 'items']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class StatusContent extends React.PureComponent {
static contextTypes = {
@@ 468,3 466,5 @@ class StatusContent extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(StatusContent));
M app/javascript/flavours/glitch/components/status_icons.jsx => app/javascript/flavours/glitch/components/status_icons.jsx +2 -1
@@ 40,7 40,6 @@ LanguageIcon.propTypes = {
language: PropTypes.string.isRequired,
};
-export default @injectIntl
class StatusIcons extends React.PureComponent {
static propTypes = {
@@ 143,3 142,5 @@ class StatusIcons extends React.PureComponent {
}
}
+
+export default injectIntl(StatusIcons);
M app/javascript/flavours/glitch/components/status_visibility_icon.jsx => app/javascript/flavours/glitch/components/status_visibility_icon.jsx +2 -1
@@ 12,7 12,6 @@ const messages = defineMessages({
direct: { id: 'privacy.direct.short', defaultMessage: 'Mentioned people only' },
});
-export default @injectIntl
class VisibilityIcon extends ImmutablePureComponent {
static propTypes = {
@@ 49,3 48,5 @@ class VisibilityIcon extends ImmutablePureComponent {
}
}
+
+export default injectIntl(VisibilityIcon);
M app/javascript/flavours/glitch/features/about/index.jsx => app/javascript/flavours/glitch/features/about/index.jsx +2 -2
@@ 80,8 80,6 @@ class Section extends React.PureComponent {
}
-export default @connect(mapStateToProps)
-@injectIntl
class About extends React.PureComponent {
static propTypes = {
@@ 218,3 216,5 @@ class About extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(About));
M app/javascript/flavours/glitch/features/account/components/account_note.jsx => app/javascript/flavours/glitch/features/account/components/account_note.jsx +2 -1
@@ 10,7 10,6 @@ const messages = defineMessages({
placeholder: { id: 'account_note.glitch_placeholder', defaultMessage: 'No comment provided' },
});
-export default @injectIntl
class Header extends ImmutablePureComponent {
static propTypes = {
@@ 102,3 101,5 @@ class Header extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Header);
M app/javascript/flavours/glitch/features/account/components/action_bar.jsx => app/javascript/flavours/glitch/features/account/components/action_bar.jsx +2 -1
@@ 8,7 8,6 @@ import { me, isStaff } from 'flavours/glitch/initial_state';
import { profileLink, accountAdminLink } from 'flavours/glitch/utils/backend_links';
import Icon from 'flavours/glitch/components/icon';
-export default @injectIntl
class ActionBar extends React.PureComponent {
static propTypes = {
@@ 83,3 82,5 @@ class ActionBar extends React.PureComponent {
}
}
+
+export default injectIntl(ActionBar);
M app/javascript/flavours/glitch/features/account/components/featured_tags.jsx => app/javascript/flavours/glitch/features/account/components/featured_tags.jsx +2 -1
@@ 10,7 10,6 @@ const messages = defineMessages({
empty: { id: 'account.featured_tags.last_status_never', defaultMessage: 'No posts' },
});
-export default @injectIntl
class FeaturedTags extends ImmutablePureComponent {
static contextTypes = {
@@ 51,3 50,5 @@ class FeaturedTags extends ImmutablePureComponent {
}
}
+
+export default injectIntl(FeaturedTags);
M => +2 -1
@@ 76,7 76,6 @@ const dateFormatOptions = {
minute: '2-digit',
};
export default @injectIntl
class Header extends ImmutablePureComponent {
static contextTypes = {
@@ 403,3 402,5 @@ class Header extends ImmutablePureComponent {
}
}
export default injectIntl(Header);
M app/javascript/flavours/glitch/features/account/components/profile_column_header.jsx => app/javascript/flavours/glitch/features/account/components/profile_column_header.jsx +2 -1
@@ 7,7 7,6 @@ const messages = defineMessages({
profile: { id: 'column_header.profile', defaultMessage: 'Profile' },
});
-export default @injectIntl
class ProfileColumnHeader extends React.PureComponent {
static propTypes = {
@@ 31,3 30,5 @@ class ProfileColumnHeader extends React.PureComponent {
}
}
+
+export default injectIntl(ProfileColumnHeader);
M app/javascript/flavours/glitch/features/account/navigation.jsx => app/javascript/flavours/glitch/features/account/navigation.jsx +2 -1
@@ 19,7 19,6 @@ const mapStateToProps = (state, { match: { params: { acct } } }) => {
};
};
-export default @connect(mapStateToProps)
class AccountNavigation extends React.PureComponent {
static propTypes = {
@@ 50,3 49,5 @@ class AccountNavigation extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(AccountNavigation);
M app/javascript/flavours/glitch/features/account_gallery/index.jsx => app/javascript/flavours/glitch/features/account_gallery/index.jsx +2 -1
@@ 58,7 58,6 @@ class LoadMoreMedia extends ImmutablePureComponent {
}
-export default @connect(mapStateToProps)
class AccountGallery extends ImmutablePureComponent {
static propTypes = {
@@ 223,3 222,5 @@ class AccountGallery extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(AccountGallery);
M app/javascript/flavours/glitch/features/account_timeline/components/limited_account_hint.jsx => app/javascript/flavours/glitch/features/account_timeline/components/limited_account_hint.jsx +2 -1
@@ 14,7 14,6 @@ const mapDispatchToProps = (dispatch, { accountId }) => ({
});
-export default @connect(() => {}, mapDispatchToProps)
class LimitedAccountHint extends React.PureComponent {
static propTypes = {
@@ 34,3 33,5 @@ class LimitedAccountHint extends React.PureComponent {
}
}
+
+export default connect(() => {}, mapDispatchToProps)(LimitedAccountHint);
M app/javascript/flavours/glitch/features/account_timeline/index.jsx => app/javascript/flavours/glitch/features/account_timeline/index.jsx +2 -1
@@ 62,7 62,6 @@ RemoteHint.propTypes = {
url: PropTypes.string.isRequired,
};
-export default @connect(mapStateToProps)
class AccountTimeline extends ImmutablePureComponent {
static propTypes = {
@@ 207,3 206,5 @@ class AccountTimeline extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(AccountTimeline);
M app/javascript/flavours/glitch/features/audio/index.jsx => app/javascript/flavours/glitch/features/audio/index.jsx +2 -1
@@ 22,7 22,6 @@ const messages = defineMessages({
const TICK_SIZE = 10;
const PADDING = 180;
-export default @injectIntl
class Audio extends React.PureComponent {
static propTypes = {
@@ 575,3 574,5 @@ class Audio extends React.PureComponent {
}
}
+
+export default injectIntl(Audio);
M app/javascript/flavours/glitch/features/blocks/index.jsx => app/javascript/flavours/glitch/features/blocks/index.jsx +2 -2
@@ 22,8 22,6 @@ const mapStateToProps = state => ({
isLoading: state.getIn(['user_lists', 'blocks', 'isLoading'], true),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Blocks extends ImmutablePureComponent {
static propTypes = {
@@ 77,3 75,5 @@ class Blocks extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Blocks));
M app/javascript/flavours/glitch/features/bookmarked_statuses/index.jsx => app/javascript/flavours/glitch/features/bookmarked_statuses/index.jsx +2 -2
@@ 22,8 22,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['status_lists', 'bookmarks', 'next']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Bookmarks extends ImmutablePureComponent {
static propTypes = {
@@ 106,3 104,5 @@ class Bookmarks extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Bookmarks));
M app/javascript/flavours/glitch/features/closed_registrations_modal/index.jsx => app/javascript/flavours/glitch/features/closed_registrations_modal/index.jsx +2 -1
@@ 9,7 9,6 @@ const mapStateToProps = state => ({
message: state.getIn(['server', 'server', 'registrations', 'message']),
});
-export default @connect(mapStateToProps)
class ClosedRegistrationsModal extends ImmutablePureComponent {
componentDidMount () {
@@ 73,3 72,5 @@ class ClosedRegistrationsModal extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(ClosedRegistrationsModal);
M app/javascript/flavours/glitch/features/community_timeline/components/column_settings.jsx => app/javascript/flavours/glitch/features/community_timeline/components/column_settings.jsx +2 -1
@@ 10,7 10,6 @@ const messages = defineMessages({
settings: { id: 'home.settings', defaultMessage: 'Column settings' },
});
-export default @injectIntl
class ColumnSettings extends React.PureComponent {
static propTypes = {
@@ 39,3 38,5 @@ class ColumnSettings extends React.PureComponent {
}
}
+
+export default injectIntl(ColumnSettings);
M => +2 -2
@@ 32,8 32,6 @@ const mapStateToProps = (state, { columnId }) => {
};
};
export default @connect(mapStateToProps)
@injectIntl
class CommunityTimeline extends React.PureComponent {
static defaultProps = {
@@ 162,3 160,5 @@ class CommunityTimeline extends React.PureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(CommunityTimeline));
M app/javascript/flavours/glitch/features/compose/components/action_bar.jsx => app/javascript/flavours/glitch/features/compose/components/action_bar.jsx +2 -1
@@ 21,7 21,6 @@ const messages = defineMessages({
bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
});
-export default @injectIntl
class ActionBar extends React.PureComponent {
static propTypes = {
@@ 66,3 65,5 @@ class ActionBar extends React.PureComponent {
}
}
+
+export default injectIntl(ActionBar);
M app/javascript/flavours/glitch/features/compose/components/compose_form.jsx => app/javascript/flavours/glitch/features/compose/components/compose_form.jsx +2 -1
@@ 32,7 32,6 @@ const messages = defineMessages({
spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Write your warning here' },
});
-export default @injectIntl
class ComposeForm extends ImmutablePureComponent {
static contextTypes = {
@@ 389,3 388,5 @@ class ComposeForm extends ImmutablePureComponent {
}
}
+
+export default injectIntl(ComposeForm);
M app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx => app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx +5 -3
@@ 145,8 145,7 @@ class ModifierPicker extends React.PureComponent {
}
-@injectIntl
-class EmojiPickerMenu extends React.PureComponent {
+class EmojiPickerMenuImpl extends React.PureComponent {
static propTypes = {
custom_emojis: ImmutablePropTypes.list,
@@ 307,7 306,8 @@ class EmojiPickerMenu extends React.PureComponent {
}
-export default @injectIntl
+const EmojiPickerMenu = injectIntl(EmojiPickerMenuImpl);
+
class EmojiPickerDropdown extends React.PureComponent {
static propTypes = {
@@ 411,3 411,5 @@ class EmojiPickerDropdown extends React.PureComponent {
}
}
+
+export default injectIntl(EmojiPickerDropdown);
M => +2 -1
@@ 45,7 45,6 @@ const messages = defineMessages({
},
});
export default @injectIntl
class Header extends ImmutablePureComponent {
static propTypes = {
@@ 134,3 133,5 @@ class Header extends ImmutablePureComponent {
}
}
export default injectIntl(Header);
M app/javascript/flavours/glitch/features/compose/components/language_dropdown.jsx => app/javascript/flavours/glitch/features/compose/components/language_dropdown.jsx +2 -1
@@ 237,7 237,6 @@ class LanguageDropdownMenu extends React.PureComponent {
}
-export default @injectIntl
class LanguageDropdown extends React.PureComponent {
static propTypes = {
@@ 325,3 324,5 @@ class LanguageDropdown extends React.PureComponent {
}
}
+
+export default injectIntl(LanguageDropdown);
M app/javascript/flavours/glitch/features/compose/components/options.jsx => app/javascript/flavours/glitch/features/compose/components/options.jsx +9 -3
@@ 83,8 83,11 @@ const messages = defineMessages({
},
});
-@connect((state, { name }) => ({ checked: state.getIn(['compose', 'advanced_options', name]) }))
-class ToggleOption extends ImmutablePureComponent {
+const mapStateToProps = (state, { name }) => ({
+ checked: state.getIn(['compose', 'advanced_options', name]),
+});
+
+class ToggleOptionImpl extends ImmutablePureComponent {
static propTypes = {
name: PropTypes.string.isRequired,
@@ 113,7 116,8 @@ class ToggleOption extends ImmutablePureComponent {
}
-export default @injectIntl
+const ToggleOption = connect(mapStateToProps)(ToggleOptionImpl);
+
class ComposerOptions extends ImmutablePureComponent {
static propTypes = {
@@ 315,3 319,5 @@ class ComposerOptions extends ImmutablePureComponent {
}
}
+
+export default injectIntl(ComposerOptions);
M app/javascript/flavours/glitch/features/compose/components/poll_form.jsx => app/javascript/flavours/glitch/features/compose/components/poll_form.jsx +5 -4
@@ 21,8 21,7 @@ const messages = defineMessages({
days: { id: 'intervals.full.days', defaultMessage: '{number, plural, one {# day} other {# days}}' },
});
-@injectIntl
-class Option extends React.PureComponent {
+class OptionIntl extends React.PureComponent {
static propTypes = {
title: PropTypes.string.isRequired,
@@ 92,8 91,8 @@ class Option extends React.PureComponent {
}
-export default
-@injectIntl
+const Option = injectIntl(OptionIntl);
+
class PollForm extends ImmutablePureComponent {
static propTypes = {
@@ 168,3 167,5 @@ class PollForm extends ImmutablePureComponent {
}
}
+
+export default injectIntl(PollForm);
M app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx => app/javascript/flavours/glitch/features/compose/components/privacy_dropdown.jsx +2 -1
@@ 16,7 16,6 @@ const messages = defineMessages({
change_privacy: { id: 'privacy.change', defaultMessage: 'Adjust status privacy' },
});
-export default @injectIntl
class PrivacyDropdown extends React.PureComponent {
static propTypes = {
@@ 86,3 85,5 @@ class PrivacyDropdown extends React.PureComponent {
}
}
+
+export default injectIntl(PrivacyDropdown);
M app/javascript/flavours/glitch/features/compose/components/publisher.jsx => app/javascript/flavours/glitch/features/compose/components/publisher.jsx +2 -1
@@ 26,7 26,6 @@ const messages = defineMessages({
saveChanges: { id: 'compose_form.save_changes', defaultMessage: 'Save changes' },
});
-export default @injectIntl
class Publisher extends ImmutablePureComponent {
static propTypes = {
@@ 97,3 96,5 @@ class Publisher extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Publisher);
M app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx => app/javascript/flavours/glitch/features/compose/components/reply_indicator.jsx +2 -1
@@ 19,7 19,6 @@ const messages = defineMessages({
});
-export default @injectIntl
class ReplyIndicator extends ImmutablePureComponent {
static propTypes = {
@@ 80,3 79,5 @@ class ReplyIndicator extends ImmutablePureComponent {
}
}
+
+export default injectIntl(ReplyIndicator);
M app/javascript/flavours/glitch/features/compose/components/search.jsx => app/javascript/flavours/glitch/features/compose/components/search.jsx +2 -1
@@ 45,7 45,6 @@ class SearchPopout extends React.PureComponent {
}
// The component.
-export default @injectIntl
class Search extends React.PureComponent {
static contextTypes = {
@@ 166,3 165,5 @@ class Search extends React.PureComponent {
}
}
+
+export default injectIntl(Search);
M app/javascript/flavours/glitch/features/compose/components/search_results.jsx => app/javascript/flavours/glitch/features/compose/components/search_results.jsx +2 -1
@@ 14,7 14,6 @@ const messages = defineMessages({
dismissSuggestion: { id: 'suggestions.dismiss', defaultMessage: 'Dismiss suggestion' },
});
-export default @injectIntl
class SearchResults extends ImmutablePureComponent {
static propTypes = {
@@ 139,3 138,5 @@ class SearchResults extends ImmutablePureComponent {
}
}
+
+export default injectIntl(SearchResults);
M app/javascript/flavours/glitch/features/compose/components/textarea_icons.jsx => app/javascript/flavours/glitch/features/compose/components/textarea_icons.jsx +2 -1
@@ 27,7 27,6 @@ const iconMap = [
['threaded_mode', 'comments', messages.threadedMode],
];
-export default @injectIntl
class TextareaIcons extends ImmutablePureComponent {
static propTypes = {
@@ 58,3 57,5 @@ class TextareaIcons extends ImmutablePureComponent {
}
}
+
+export default injectIntl(TextareaIcons);
M app/javascript/flavours/glitch/features/compose/index.jsx => app/javascript/flavours/glitch/features/compose/index.jsx +2 -2
@@ 39,8 39,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
},
});
-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
class Compose extends React.PureComponent {
static propTypes = {
@@ 114,3 112,5 @@ class Compose extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(Compose));
M app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.jsx => app/javascript/flavours/glitch/features/direct_timeline/components/column_settings.jsx +2 -1
@@ 10,7 10,6 @@ const messages = defineMessages({
settings: { id: 'home.settings', defaultMessage: 'Column settings' },
});
-export default @injectIntl
class ColumnSettings extends React.PureComponent {
static propTypes = {
@@ 40,3 39,5 @@ class ColumnSettings extends React.PureComponent {
}
}
+
+export default injectIntl(ColumnSettings);
M app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx => app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx +2 -1
@@ 24,7 24,6 @@ const messages = defineMessages({
unmuteConversation: { id: 'status.unmute_conversation', defaultMessage: 'Unmute conversation' },
});
-export default @injectIntl
class Conversation extends ImmutablePureComponent {
static contextTypes = {
@@ 230,3 229,5 @@ class Conversation extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Conversation);
M app/javascript/flavours/glitch/features/direct_timeline/index.jsx => app/javascript/flavours/glitch/features/direct_timeline/index.jsx +2 -2
@@ 22,8 22,6 @@ const mapStateToProps = state => ({
conversationsMode: state.getIn(['settings', 'direct', 'conversations']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class DirectTimeline extends React.PureComponent {
static propTypes = {
@@ 154,3 152,5 @@ class DirectTimeline extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(DirectTimeline));
M app/javascript/flavours/glitch/features/directory/components/account_card.jsx => app/javascript/flavours/glitch/features/directory/components/account_card.jsx +2 -3
@@ 93,9 93,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
});
-export default
-@injectIntl
-@connect(makeMapStateToProps, mapDispatchToProps)
class AccountCard extends ImmutablePureComponent {
static propTypes = {
@@ 246,3 243,5 @@ class AccountCard extends ImmutablePureComponent {
}
}
+
+export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(AccountCard));
M app/javascript/flavours/glitch/features/directory/index.jsx => app/javascript/flavours/glitch/features/directory/index.jsx +2 -2
@@ 29,8 29,6 @@ const mapStateToProps = state => ({
domain: state.getIn(['meta', 'domain']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Directory extends React.PureComponent {
static contextTypes = {
@@ 176,3 174,5 @@ class Directory extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Directory));
M app/javascript/flavours/glitch/features/domain_blocks/index.jsx => app/javascript/flavours/glitch/features/domain_blocks/index.jsx +2 -2
@@ 23,8 23,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['domain_lists', 'blocks', 'next']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Blocks extends ImmutablePureComponent {
static propTypes = {
@@ 81,3 79,5 @@ class Blocks extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Blocks));
M app/javascript/flavours/glitch/features/explore/index.jsx => app/javascript/flavours/glitch/features/explore/index.jsx +2 -2
@@ 24,8 24,6 @@ const mapStateToProps = state => ({
isSearching: state.getIn(['search', 'submitted']) || !showTrends,
});
-export default @connect(mapStateToProps)
-@injectIntl
class Explore extends React.PureComponent {
static contextTypes = {
@@ 105,3 103,5 @@ class Explore extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Explore));
M app/javascript/flavours/glitch/features/explore/links.jsx => app/javascript/flavours/glitch/features/explore/links.jsx +2 -1
@@ 13,7 13,6 @@ const mapStateToProps = state => ({
isLoading: state.getIn(['trends', 'links', 'isLoading']),
});
-export default @connect(mapStateToProps)
class Links extends React.PureComponent {
static propTypes = {
@@ 68,3 67,5 @@ class Links extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(Links);
M app/javascript/flavours/glitch/features/explore/results.jsx => app/javascript/flavours/glitch/features/explore/results.jsx +2 -2
@@ 42,8 42,6 @@ const renderStatuses = (results, onLoadMore) => appendLoadMore('statuses', resul
<Status key={`status-${item}`} id={item} />
)), onLoadMore);
-export default @connect(mapStateToProps)
-@injectIntl
class Results extends React.PureComponent {
static propTypes = {
@@ 124,3 122,5 @@ class Results extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Results));
M app/javascript/flavours/glitch/features/explore/statuses.jsx => app/javascript/flavours/glitch/features/explore/statuses.jsx +2 -1
@@ 14,7 14,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['status_lists', 'trending', 'next']),
});
-export default @connect(mapStateToProps)
class Statuses extends React.PureComponent {
static propTypes = {
@@ 62,3 61,5 @@ class Statuses extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(Statuses);
M app/javascript/flavours/glitch/features/explore/suggestions.jsx => app/javascript/flavours/glitch/features/explore/suggestions.jsx +2 -1
@@ 12,7 12,6 @@ const mapStateToProps = state => ({
isLoading: state.getIn(['suggestions', 'isLoading']),
});
-export default @connect(mapStateToProps)
class Suggestions extends React.PureComponent {
static propTypes = {
@@ 54,3 53,5 @@ class Suggestions extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(Suggestions);
M app/javascript/flavours/glitch/features/explore/tags.jsx => app/javascript/flavours/glitch/features/explore/tags.jsx +2 -1
@@ 13,7 13,6 @@ const mapStateToProps = state => ({
isLoadingHashtags: state.getIn(['trends', 'tags', 'isLoading']),
});
-export default @connect(mapStateToProps)
class Tags extends React.PureComponent {
static propTypes = {
@@ 60,3 59,5 @@ class Tags extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(Tags);
M app/javascript/flavours/glitch/features/favourited_statuses/index.jsx => app/javascript/flavours/glitch/features/favourited_statuses/index.jsx +2 -2
@@ 22,8 22,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['status_lists', 'favourites', 'next']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Favourites extends ImmutablePureComponent {
static propTypes = {
@@ 106,3 104,5 @@ class Favourites extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Favourites));
M app/javascript/flavours/glitch/features/favourites/index.jsx => app/javascript/flavours/glitch/features/favourites/index.jsx +2 -2
@@ 22,8 22,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 = {
@@ 101,3 99,5 @@ class Favourites extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Favourites));
M app/javascript/flavours/glitch/features/filters/added_to_filter.jsx => app/javascript/flavours/glitch/features/filters/added_to_filter.jsx +2 -1
@@ 10,7 10,6 @@ const mapStateToProps = (state, { filterId }) => ({
filter: state.getIn(['filters', filterId]),
});
-export default @connect(mapStateToProps)
class AddedToFilter extends React.PureComponent {
static propTypes = {
@@ 100,3 99,5 @@ class AddedToFilter extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(AddedToFilter);
M app/javascript/flavours/glitch/features/filters/select_filter.jsx => app/javascript/flavours/glitch/features/filters/select_filter.jsx +2 -2
@@ 22,8 22,6 @@ const mapStateToProps = (state, { contextType }) => ({
]),
});
-export default @connect(mapStateToProps)
-@injectIntl
class SelectFilter extends React.PureComponent {
static propTypes = {
@@ 190,3 188,5 @@ class SelectFilter extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(SelectFilter));
M app/javascript/flavours/glitch/features/follow_recommendations/components/account.jsx => app/javascript/flavours/glitch/features/follow_recommendations/components/account.jsx +2 -2
@@ 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));
M app/javascript/flavours/glitch/features/follow_recommendations/index.jsx => app/javascript/flavours/glitch/features/follow_recommendations/index.jsx +2 -1
@@ 19,7 19,6 @@ const mapStateToProps = state => ({
isLoading: state.getIn(['suggestions', 'isLoading']),
});
-export default @connect(mapStateToProps)
class FollowRecommendations extends ImmutablePureComponent {
static contextTypes = {
@@ 114,3 113,5 @@ class FollowRecommendations extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(FollowRecommendations);
M app/javascript/flavours/glitch/features/follow_requests/components/account_authorize.jsx => app/javascript/flavours/glitch/features/follow_requests/components/account_authorize.jsx +2 -1
@@ 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);
M app/javascript/flavours/glitch/features/follow_requests/index.jsx => app/javascript/flavours/glitch/features/follow_requests/index.jsx +2 -2
@@ 25,8 25,6 @@ const mapStateToProps = state => ({
domain: state.getIn(['meta', 'domain']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class FollowRequests extends ImmutablePureComponent {
static propTypes = {
@@ 90,3 88,5 @@ class FollowRequests extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(FollowRequests));
M app/javascript/flavours/glitch/features/followed_tags/index.jsx => app/javascript/flavours/glitch/features/followed_tags/index.jsx +2 -2
@@ 22,8 22,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['followed_tags', 'next']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class FollowedTags extends ImmutablePureComponent {
static propTypes = {
@@ 87,3 85,5 @@ class FollowedTags extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(FollowedTags));
M app/javascript/flavours/glitch/features/followers/index.jsx => app/javascript/flavours/glitch/features/followers/index.jsx +2 -1
@@ 53,7 53,6 @@ RemoteHint.propTypes = {
url: PropTypes.string.isRequired,
};
-export default @connect(mapStateToProps)
class Followers extends ImmutablePureComponent {
static propTypes = {
@@ 172,3 171,5 @@ class Followers extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(Followers);
M app/javascript/flavours/glitch/features/following/index.jsx => app/javascript/flavours/glitch/features/following/index.jsx +2 -1
@@ 53,7 53,6 @@ RemoteHint.propTypes = {
url: PropTypes.string.isRequired,
};
-export default @connect(mapStateToProps)
class Following extends ImmutablePureComponent {
static propTypes = {
@@ 172,3 171,5 @@ class Following extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(Following);
M app/javascript/flavours/glitch/features/getting_started/components/announcements.jsx => app/javascript/flavours/glitch/features/getting_started/components/announcements.jsx +2 -1
@@ 355,7 355,6 @@ class Announcement extends ImmutablePureComponent {
}
-export default @injectIntl
class Announcements extends ImmutablePureComponent {
static propTypes = {
@@ 447,3 446,5 @@ class Announcements extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Announcements);
M app/javascript/flavours/glitch/features/getting_started/index.jsx => app/javascript/flavours/glitch/features/getting_started/index.jsx +2 -2
@@ 79,8 79,6 @@ const badgeDisplay = (number, limit) => {
const NAVIGATION_PANEL_BREAKPOINT = 600 + (285 * 2) + (10 * 2);
-export default @connect(makeMapStateToProps, mapDispatchToProps)
- @injectIntl
class GettingStarted extends ImmutablePureComponent {
static contextTypes = {
@@ 202,3 200,5 @@ class GettingStarted extends ImmutablePureComponent {
}
}
+
+export default connect(makeMapStateToProps, mapDispatchToProps)(injectIntl(GettingStarted));
M app/javascript/flavours/glitch/features/getting_started_misc/index.jsx => app/javascript/flavours/glitch/features/getting_started_misc/index.jsx +3 -3
@@ 22,9 22,7 @@ const messages = defineMessages({
featured_users: { id: 'navigation_bar.featured_users', defaultMessage: 'Featured users' },
});
-export default @connect()
-@injectIntl
-class gettingStartedMisc extends ImmutablePureComponent {
+class GettingStartedMisc extends ImmutablePureComponent {
static contextTypes = {
router: PropTypes.object.isRequired,
@@ 68,3 66,5 @@ class gettingStartedMisc extends ImmutablePureComponent {
}
}
+
+export default connect()(injectIntl(GettingStartedMisc));
M app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.jsx => app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.jsx +2 -1
@@ 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);
M app/javascript/flavours/glitch/features/hashtag_timeline/index.jsx => app/javascript/flavours/glitch/features/hashtag_timeline/index.jsx +2 -2
@@ 26,8 26,6 @@ const mapStateToProps = (state, props) => ({
tag: state.getIn(['tags', props.params.id]),
});
-export default @connect(mapStateToProps)
-@injectIntl
class HashtagTimeline extends React.PureComponent {
disconnects = [];
@@ 235,3 233,5 @@ class HashtagTimeline extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(HashtagTimeline));
M app/javascript/flavours/glitch/features/home_timeline/components/column_settings.jsx => app/javascript/flavours/glitch/features/home_timeline/components/column_settings.jsx +2 -1
@@ 10,7 10,6 @@ const messages = defineMessages({
settings: { id: 'home.settings', defaultMessage: 'Column settings' },
});
-export default @injectIntl
class ColumnSettings extends React.PureComponent {
static propTypes = {
@@ 48,3 47,5 @@ class ColumnSettings extends React.PureComponent {
}
}
+
+export default injectIntl(ColumnSettings);
M app/javascript/flavours/glitch/features/home_timeline/index.jsx => app/javascript/flavours/glitch/features/home_timeline/index.jsx +2 -2
@@ 31,8 31,6 @@ const mapStateToProps = state => ({
regex: state.getIn(['settings', 'home', 'regex', 'body']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class HomeTimeline extends React.PureComponent {
static contextTypes = {
@@ 176,3 174,5 @@ class HomeTimeline extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(HomeTimeline));
M app/javascript/flavours/glitch/features/interaction_modal/index.jsx => app/javascript/flavours/glitch/features/interaction_modal/index.jsx +2 -1
@@ 74,7 74,6 @@ class Copypaste extends React.PureComponent {
}
-export default @connect(mapStateToProps, mapDispatchToProps)
class InteractionModal extends React.PureComponent {
static propTypes = {
@@ 159,3 158,5 @@ class InteractionModal extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(InteractionModal);
M app/javascript/flavours/glitch/features/keyboard_shortcuts/index.jsx => app/javascript/flavours/glitch/features/keyboard_shortcuts/index.jsx +2 -2
@@ 15,8 15,6 @@ const mapStateToProps = state => ({
collapseEnabled: state.getIn(['local_settings', 'collapsed', 'enabled']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class KeyboardShortcuts extends ImmutablePureComponent {
static propTypes = {
@@ 147,3 145,5 @@ class KeyboardShortcuts extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(KeyboardShortcuts));
M app/javascript/flavours/glitch/features/list_adder/components/account.jsx => app/javascript/flavours/glitch/features/list_adder/components/account.jsx +2 -2
@@ 18,8 18,6 @@ const makeMapStateToProps = () => {
};
-export default @connect(makeMapStateToProps)
-@injectIntl
class Account extends ImmutablePureComponent {
static propTypes = {
@@ 41,3 39,5 @@ class Account extends ImmutablePureComponent {
}
}
+
+export default connect(makeMapStateToProps)(injectIntl(Account));
M app/javascript/flavours/glitch/features/list_adder/components/list.jsx => app/javascript/flavours/glitch/features/list_adder/components/list.jsx +3 -3
@@ 13,7 13,7 @@ const messages = defineMessages({
add: { id: 'lists.account.add', defaultMessage: 'Add to list' },
});
-const MapStateToProps = (state, { listId, added }) => ({
+const mapStateToProps = (state, { listId, added }) => ({
list: state.get('lists').get(listId),
added: typeof added === 'undefined' ? state.getIn(['listAdder', 'lists', 'items']).includes(listId) : added,
});
@@ 23,8 23,6 @@ const mapDispatchToProps = (dispatch, { listId }) => ({
onAdd: () => dispatch(addToListAdder(listId)),
});
-export default @connect(MapStateToProps, mapDispatchToProps)
-@injectIntl
class List extends ImmutablePureComponent {
static propTypes = {
@@ 67,3 65,5 @@ class List extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(List));
M app/javascript/flavours/glitch/features/list_adder/index.jsx => app/javascript/flavours/glitch/features/list_adder/index.jsx +2 -2
@@ 28,8 28,6 @@ const mapDispatchToProps = dispatch => ({
onReset: () => dispatch(resetListAdder()),
});
-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
class ListAdder extends ImmutablePureComponent {
static propTypes = {
@@ 71,3 69,5 @@ class ListAdder extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(ListAdder));
M app/javascript/flavours/glitch/features/list_editor/components/edit_list_form.jsx => app/javascript/flavours/glitch/features/list_editor/components/edit_list_form.jsx +2 -2
@@ 19,8 19,6 @@ const mapDispatchToProps = dispatch => ({
onSubmit: () => dispatch(submitListEditor(false)),
});
-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
class ListForm extends React.PureComponent {
static propTypes = {
@@ 68,3 66,5 @@ class ListForm extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(ListForm));
M app/javascript/flavours/glitch/features/list_editor/index.jsx => app/javascript/flavours/glitch/features/list_editor/index.jsx +2 -2
@@ 22,8 22,6 @@ const mapDispatchToProps = dispatch => ({
onReset: () => dispatch(resetListEditor()),
});
-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
class ListEditor extends ImmutablePureComponent {
static propTypes = {
@@ 77,3 75,5 @@ class ListEditor extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(ListEditor));
M app/javascript/flavours/glitch/features/list_timeline/index.jsx => app/javascript/flavours/glitch/features/list_timeline/index.jsx +2 -2
@@ 31,8 31,6 @@ const mapStateToProps = (state, props) => ({
hasUnread: state.getIn(['timelines', `list:${props.params.id}`, 'unread']) > 0,
});
-export default @connect(mapStateToProps)
-@injectIntl
class ListTimeline extends React.PureComponent {
static contextTypes = {
@@ 222,3 220,5 @@ class ListTimeline extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(ListTimeline));
M app/javascript/flavours/glitch/features/lists/components/new_list_form.jsx => app/javascript/flavours/glitch/features/lists/components/new_list_form.jsx +2 -2
@@ 20,8 20,6 @@ const mapDispatchToProps = dispatch => ({
onSubmit: () => dispatch(submitListEditor(true)),
});
-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
class NewListForm extends React.PureComponent {
static propTypes = {
@@ 76,3 74,5 @@ class NewListForm extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(NewListForm));
M app/javascript/flavours/glitch/features/lists/index.jsx => app/javascript/flavours/glitch/features/lists/index.jsx +2 -2
@@ 32,8 32,6 @@ const mapStateToProps = state => ({
lists: getOrderedLists(state),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Lists extends ImmutablePureComponent {
static propTypes = {
@@ 87,3 85,5 @@ class Lists extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Lists));
M app/javascript/flavours/glitch/features/local_settings/navigation/index.jsx => app/javascript/flavours/glitch/features/local_settings/navigation/index.jsx +2 -1
@@ 19,7 19,6 @@ const messages = defineMessages({
close: { id: 'settings.close', defaultMessage: 'Close' },
});
-export default @injectIntl
class LocalSettingsNavigation extends React.PureComponent {
static propTypes = {
@@ 90,3 89,5 @@ class LocalSettingsNavigation extends React.PureComponent {
}
}
+
+export default injectIntl(LocalSettingsNavigation);
M app/javascript/flavours/glitch/features/local_settings/page/index.jsx => app/javascript/flavours/glitch/features/local_settings/page/index.jsx +2 -1
@@ 31,7 31,6 @@ const messages = defineMessages({
pop_in_right: { id: 'settings.pop_in_right', defaultMessage: 'Right' },
});
-export default @injectIntl
class LocalSettingsPage extends React.PureComponent {
static propTypes = {
@@ 513,3 512,5 @@ class LocalSettingsPage extends React.PureComponent {
}
}
+
+export default injectIntl(LocalSettingsPage);
M app/javascript/flavours/glitch/features/mutes/index.jsx => app/javascript/flavours/glitch/features/mutes/index.jsx +2 -2
@@ 23,8 23,6 @@ const mapStateToProps = state => ({
isLoading: state.getIn(['user_lists', 'mutes', 'isLoading'], true),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Mutes extends ImmutablePureComponent {
static propTypes = {
@@ 82,3 80,5 @@ class Mutes extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Mutes));
M app/javascript/flavours/glitch/features/notifications/components/filter_bar.jsx => app/javascript/flavours/glitch/features/notifications/components/filter_bar.jsx +2 -1
@@ 12,7 12,6 @@ const tooltips = defineMessages({
statuses: { id: 'notifications.filter.statuses', defaultMessage: 'Updates from people you follow' },
});
-export default @injectIntl
class FilterBar extends React.PureComponent {
static propTypes = {
@@ 108,3 107,5 @@ class FilterBar extends React.PureComponent {
}
}
+
+export default injectIntl(FilterBar);
M app/javascript/flavours/glitch/features/notifications/components/follow_request.jsx => app/javascript/flavours/glitch/features/notifications/components/follow_request.jsx +2 -1
@@ 17,7 17,6 @@ const messages = defineMessages({
reject: { id: 'follow_request.reject', defaultMessage: 'Reject' },
});
-export default @injectIntl
class FollowRequest extends ImmutablePureComponent {
static propTypes = {
@@ 130,3 129,5 @@ class FollowRequest extends ImmutablePureComponent {
}
}
+
+export default injectIntl(FollowRequest);
M app/javascript/flavours/glitch/features/notifications/components/notifications_permission_banner.jsx => app/javascript/flavours/glitch/features/notifications/components/notifications_permission_banner.jsx +2 -2
@@ 12,8 12,6 @@ const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' },
});
-export default @connect()
-@injectIntl
class NotificationsPermissionBanner extends React.PureComponent {
static propTypes = {
@@ 46,3 44,5 @@ class NotificationsPermissionBanner extends React.PureComponent {
}
}
+
+export default connect()(injectIntl(NotificationsPermissionBanner));
M app/javascript/flavours/glitch/features/notifications/components/overlay.jsx => app/javascript/flavours/glitch/features/notifications/components/overlay.jsx +2 -1
@@ 15,7 15,6 @@ const messages = defineMessages({
markForDeletion: { id: 'notification.markForDeletion', defaultMessage: 'Mark for deletion' },
});
-export default @injectIntl
class NotificationOverlay extends ImmutablePureComponent {
static propTypes = {
@@ 56,3 55,5 @@ class NotificationOverlay extends ImmutablePureComponent {
}
}
+
+export default injectIntl(NotificationOverlay);
M app/javascript/flavours/glitch/features/notifications/components/report.jsx => app/javascript/flavours/glitch/features/notifications/components/report.jsx +2 -1
@@ 13,7 13,6 @@ const messages = defineMessages({
violation: { id: 'report_notification.categories.violation', defaultMessage: 'Rule violation' },
});
-export default @injectIntl
class Report extends ImmutablePureComponent {
static propTypes = {
@@ 60,3 59,5 @@ class Report extends ImmutablePureComponent {
}
}
+
+export default injectIntl(Report);
M app/javascript/flavours/glitch/features/notifications/index.jsx => app/javascript/flavours/glitch/features/notifications/index.jsx +2 -2
@@ 92,8 92,6 @@ const mapDispatchToProps = dispatch => ({
dispatch,
});
-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
class Notifications extends React.PureComponent {
static contextTypes = {
@@ 380,3 378,5 @@ class Notifications extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(Notifications));
M => +2 -2
@@ 38,8 38,6 @@ const makeMapStateToProps = () => {
return mapStateToProps;
};
export default @connect(makeMapStateToProps)
@injectIntl
class Footer extends ImmutablePureComponent {
static contextTypes = {
@@ 215,3 213,5 @@ class Footer extends ImmutablePureComponent {
}
}
export default connect(makeMapStateToProps)(injectIntl(Footer));
M => +2 -2
@@ 17,8 17,6 @@ const mapStateToProps = (state, { accountId }) => ({
account: state.getIn(['accounts', accountId]),
});
export default @connect(mapStateToProps)
@injectIntl
class Header extends ImmutablePureComponent {
static propTypes = {
@@ 45,3 43,5 @@ class Header extends ImmutablePureComponent {
}
}
export default connect(mapStateToProps)(injectIntl(Header));
M app/javascript/flavours/glitch/features/picture_in_picture/index.jsx => app/javascript/flavours/glitch/features/picture_in_picture/index.jsx +2 -1
@@ 13,7 13,6 @@ const mapStateToProps = state => ({
left: state.getIn(['local_settings', 'media', 'pop_in_position']) === 'left',
});
-export default @connect(mapStateToProps)
class PictureInPicture extends React.Component {
static propTypes = {
@@ 86,3 85,5 @@ class PictureInPicture extends React.Component {
}
}
+
+export default connect(mapStateToProps)(PictureInPicture);
M app/javascript/flavours/glitch/features/pinned_accounts_editor/index.jsx => app/javascript/flavours/glitch/features/pinned_accounts_editor/index.jsx +2 -2
@@ 21,8 21,6 @@ const mapDispatchToProps = dispatch => ({
onReset: () => dispatch(resetPinnedAccountsEditor()),
});
-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
class PinnedAccountsEditor extends ImmutablePureComponent {
static propTypes = {
@@ 76,3 74,5 @@ class PinnedAccountsEditor extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(PinnedAccountsEditor));
M app/javascript/flavours/glitch/features/pinned_statuses/index.jsx => app/javascript/flavours/glitch/features/pinned_statuses/index.jsx +2 -2
@@ 19,8 19,6 @@ const mapStateToProps = state => ({
hasMore: !!state.getIn(['status_lists', 'pins', 'next']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class PinnedStatuses extends ImmutablePureComponent {
static propTypes = {
@@ 63,3 61,5 @@ class PinnedStatuses extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(PinnedStatuses));
M app/javascript/flavours/glitch/features/privacy_policy/index.jsx => app/javascript/flavours/glitch/features/privacy_policy/index.jsx +2 -1
@@ 10,7 10,6 @@ const messages = defineMessages({
title: { id: 'privacy_policy.title', defaultMessage: 'Privacy Policy' },
});
-export default @injectIntl
class PrivacyPolicy extends React.PureComponent {
static propTypes = {
@@ 59,3 58,5 @@ class PrivacyPolicy extends React.PureComponent {
}
}
+
+export default injectIntl(PrivacyPolicy);
M app/javascript/flavours/glitch/features/public_timeline/components/column_settings.jsx => app/javascript/flavours/glitch/features/public_timeline/components/column_settings.jsx +2 -1
@@ 9,7 9,6 @@ const messages = defineMessages({
filter_regex: { id: 'home.column_settings.filter_regex', defaultMessage: 'Filter out by regular expressions' },
});
-export default @injectIntl
class ColumnSettings extends React.PureComponent {
static propTypes = {
@@ 40,3 39,5 @@ class ColumnSettings extends React.PureComponent {
}
}
+
+export default injectIntl(ColumnSettings);
M app/javascript/flavours/glitch/features/public_timeline/index.jsx => app/javascript/flavours/glitch/features/public_timeline/index.jsx +2 -2
@@ 35,8 35,6 @@ const mapStateToProps = (state, { columnId }) => {
};
};
-export default @connect(mapStateToProps)
-@injectIntl
class PublicTimeline extends React.PureComponent {
static defaultProps = {
@@ 166,3 164,5 @@ class PublicTimeline extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(PublicTimeline));
M app/javascript/flavours/glitch/features/reblogs/index.jsx => app/javascript/flavours/glitch/features/reblogs/index.jsx +2 -2
@@ 22,8 22,6 @@ const mapStateToProps = (state, props) => ({
accountIds: state.getIn(['user_lists', 'reblogged_by', props.params.statusId]),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Reblogs extends ImmutablePureComponent {
static propTypes = {
@@ 102,3 100,5 @@ class Reblogs extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Reblogs));
M app/javascript/flavours/glitch/features/report/category.jsx => app/javascript/flavours/glitch/features/report/category.jsx +2 -2
@@ 24,8 24,6 @@ const mapStateToProps = state => ({
rules: state.getIn(['server', 'server', 'rules'], ImmutableList()),
});
-export default @connect(mapStateToProps)
-@injectIntl
class Category extends React.PureComponent {
static propTypes = {
@@ 102,3 100,5 @@ class Category extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(Category));
M => +2 -1
@@ 8,7 8,6 @@ const messages = defineMessages({
placeholder: { id: 'report.placeholder', defaultMessage: 'Type or paste additional comments' },
});
export default @injectIntl
class Comment extends React.PureComponent {
static propTypes = {
@@ 81,3 80,5 @@ class Comment extends React.PureComponent {
}
}
export default injectIntl(Comment);
M app/javascript/flavours/glitch/features/report/rules.jsx => app/javascript/flavours/glitch/features/report/rules.jsx +2 -1
@@ 10,7 10,6 @@ const mapStateToProps = state => ({
rules: state.getIn(['server', 'server', 'rules']),
});
-export default @connect(mapStateToProps)
class Rules extends React.PureComponent {
static propTypes = {
@@ 62,3 61,5 @@ class Rules extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(Rules);
M app/javascript/flavours/glitch/features/report/statuses.jsx => app/javascript/flavours/glitch/features/report/statuses.jsx +2 -1
@@ 13,7 13,6 @@ const mapStateToProps = (state, { accountId }) => ({
isLoading: state.getIn(['timelines', `account:${accountId}:with_replies`, 'isLoading']),
});
-export default @connect(mapStateToProps)
class Statuses extends React.PureComponent {
static propTypes = {
@@ 59,3 58,5 @@ class Statuses extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(Statuses);
M app/javascript/flavours/glitch/features/report/thanks.jsx => app/javascript/flavours/glitch/features/report/thanks.jsx +2 -1
@@ 12,7 12,6 @@ import {
const mapStateToProps = () => ({});
-export default @connect(mapStateToProps)
class Thanks extends React.PureComponent {
static propTypes = {
@@ 82,3 81,5 @@ class Thanks extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(Thanks);
M app/javascript/flavours/glitch/features/status/components/action_bar.jsx => app/javascript/flavours/glitch/features/status/components/action_bar.jsx +2 -1
@@ 39,7 39,6 @@ const messages = defineMessages({
openOriginalPage: { id: 'account.open_original_page', defaultMessage: 'Open original page' },
});
-export default @injectIntl
class ActionBar extends React.PureComponent {
static contextTypes = {
@@ 228,3 227,5 @@ class ActionBar extends React.PureComponent {
}
}
+
+export default injectIntl(ActionBar);
M app/javascript/flavours/glitch/features/status/components/detailed_status.jsx => app/javascript/flavours/glitch/features/status/components/detailed_status.jsx +2 -1
@@ 21,7 21,6 @@ import AnimatedNumber from 'flavours/glitch/components/animated_number';
import PictureInPicturePlaceholder from 'flavours/glitch/components/picture_in_picture_placeholder';
import EditedTimestamp from 'flavours/glitch/components/edited_timestamp';
-export default @injectIntl
class DetailedStatus extends ImmutablePureComponent {
static contextTypes = {
@@ 336,3 335,5 @@ class DetailedStatus extends ImmutablePureComponent {
}
}
+
+export default injectIntl(DetailedStatus);
M app/javascript/flavours/glitch/features/status/index.jsx => app/javascript/flavours/glitch/features/status/index.jsx +2 -2
@@ 171,8 171,6 @@ const titleFromStatus = status => {
return `${prefix}: "${truncate(text, 30)}"`;
};
-export default @injectIntl
-@connect(makeMapStateToProps)
class Status extends ImmutablePureComponent {
static contextTypes = {
@@ 724,3 722,5 @@ class Status extends ImmutablePureComponent {
}
}
+
+export default injectIntl(connect(makeMapStateToProps)(Status));
M app/javascript/flavours/glitch/features/subscribed_languages_modal/index.jsx => app/javascript/flavours/glitch/features/subscribed_languages_modal/index.jsx +2 -2
@@ 36,8 36,6 @@ const mapDispatchToProps = (dispatch, { accountId }) => ({
});
-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
class SubscribedLanguagesModal extends ImmutablePureComponent {
static propTypes = {
@@ 123,3 121,5 @@ class SubscribedLanguagesModal extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(SubscribedLanguagesModal));
M app/javascript/flavours/glitch/features/ui/components/audio_modal.jsx => app/javascript/flavours/glitch/features/ui/components/audio_modal.jsx +2 -1
@@ 11,7 11,6 @@ const mapStateToProps = (state, { statusId }) => ({
accountStaticAvatar: state.getIn(['accounts', state.getIn(['statuses', statusId, 'account']), 'avatar_static']),
});
-export default @connect(mapStateToProps, null, null, { forwardRef: true })
class AudioModal extends ImmutablePureComponent {
static propTypes = {
@@ 59,3 58,5 @@ class AudioModal extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, null, null, { forwardRef: true })(AudioModal);
M app/javascript/flavours/glitch/features/ui/components/block_modal.jsx => app/javascript/flavours/glitch/features/ui/components/block_modal.jsx +2 -2
@@ 36,8 36,6 @@ const mapDispatchToProps = dispatch => {
};
};
-export default @connect(makeMapStateToProps, mapDispatchToProps)
-@injectIntl
class BlockModal extends React.PureComponent {
static propTypes = {
@@ 101,3 99,5 @@ class BlockModal extends React.PureComponent {
}
}
+
+export default connect(makeMapStateToProps, mapDispatchToProps)(injectIntl(BlockModal));
M app/javascript/flavours/glitch/features/ui/components/boost_modal.jsx => app/javascript/flavours/glitch/features/ui/components/boost_modal.jsx +2 -2
@@ 35,8 35,6 @@ const mapDispatchToProps = dispatch => {
};
};
-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
class BoostModal extends ImmutablePureComponent {
static contextTypes = {
@@ 137,3 135,5 @@ class BoostModal extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(BoostModal));
M app/javascript/flavours/glitch/features/ui/components/bundle_column_error.jsx => app/javascript/flavours/glitch/features/ui/components/bundle_column_error.jsx +2 -1
@@ 92,7 92,6 @@ class CopyButton extends React.PureComponent {
}
-export default @injectIntl
class BundleColumnError extends React.PureComponent {
static propTypes = {
@@ 160,3 159,5 @@ class BundleColumnError extends React.PureComponent {
}
}
+
+export default injectIntl(BundleColumnError);
M app/javascript/flavours/glitch/features/ui/components/compare_history_modal.jsx => app/javascript/flavours/glitch/features/ui/components/compare_history_modal.jsx +2 -1
@@ 24,7 24,6 @@ const mapDispatchToProps = dispatch => ({
});
-export default @connect(mapStateToProps, mapDispatchToProps)
class CompareHistoryModal extends React.PureComponent {
static propTypes = {
@@ 100,3 99,5 @@ class CompareHistoryModal extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(CompareHistoryModal);
M app/javascript/flavours/glitch/features/ui/components/compose_panel.jsx => app/javascript/flavours/glitch/features/ui/components/compose_panel.jsx +2 -1
@@ 8,7 8,6 @@ import LinkFooter from './link_footer';
import ServerBanner from 'flavours/glitch/components/server_banner';
import { mountCompose, unmountCompose } from 'flavours/glitch/actions/compose';
-export default @connect()
class ComposePanel extends React.PureComponent {
static contextTypes = {
@@ 56,3 55,5 @@ class ComposePanel extends React.PureComponent {
}
}
+
+export default connect()(ComposePanel);
M app/javascript/flavours/glitch/features/ui/components/confirmation_modal.jsx => app/javascript/flavours/glitch/features/ui/components/confirmation_modal.jsx +2 -1
@@ 3,7 3,6 @@ import PropTypes from 'prop-types';
import { injectIntl, FormattedMessage } from 'react-intl';
import Button from 'flavours/glitch/components/button';
-export default @injectIntl
class ConfirmationModal extends React.PureComponent {
static propTypes = {
@@ 86,3 85,5 @@ class ConfirmationModal extends React.PureComponent {
}
}
+
+export default injectIntl(ConfirmationModal);
M app/javascript/flavours/glitch/features/ui/components/deprecated_settings_modal.jsx => app/javascript/flavours/glitch/features/ui/components/deprecated_settings_modal.jsx +2 -1
@@ 13,7 13,6 @@ const messages = defineMessages({
user_setting_disable_swiping: { id: 'settings.swipe_to_change_columns', defaultMessage: 'Allow swiping to change columns (Mobile only)' },
});
-export default @injectIntl
class DeprecatedSettingsModal extends React.PureComponent {
static propTypes = {
@@ 84,3 83,5 @@ class DeprecatedSettingsModal extends React.PureComponent {
}
}
+
+export default injectIntl(DeprecatedSettingsModal);
M app/javascript/flavours/glitch/features/ui/components/disabled_account_banner.jsx => app/javascript/flavours/glitch/features/ui/components/disabled_account_banner.jsx +2 -2
@@ 28,8 28,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
},
});
-export default @injectIntl
-@connect(mapStateToProps, mapDispatchToProps)
class DisabledAccountBanner extends React.PureComponent {
static propTypes = {
@@ 90,3 88,5 @@ class DisabledAccountBanner extends React.PureComponent {
}
}
+
+export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(DisabledAccountBanner));
M app/javascript/flavours/glitch/features/ui/components/doodle_modal.jsx => app/javascript/flavours/glitch/features/ui/components/doodle_modal.jsx +2 -1
@@ 145,7 145,6 @@ const mapDispatchToProps = dispatch => ({
* - Ctrl + left mouse button: pick background
* - Right mouse button: pick background
*/
-export default @connect(mapStateToProps, mapDispatchToProps)
class DoodleModal extends ImmutablePureComponent {
static propTypes = {
@@ 612,3 611,5 @@ class DoodleModal extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(DoodleModal);
M app/javascript/flavours/glitch/features/ui/components/embed_modal.jsx => app/javascript/flavours/glitch/features/ui/components/embed_modal.jsx +2 -1
@@ 9,7 9,6 @@ const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' },
});
-export default @injectIntl
class EmbedModal extends ImmutablePureComponent {
static propTypes = {
@@ 95,3 94,5 @@ class EmbedModal extends ImmutablePureComponent {
}
}
+
+export default injectIntl(EmbedModal);
M app/javascript/flavours/glitch/features/ui/components/favourite_modal.jsx => app/javascript/flavours/glitch/features/ui/components/favourite_modal.jsx +2 -1
@@ 17,7 17,6 @@ const messages = defineMessages({
favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
});
-export default @injectIntl
class FavouriteModal extends ImmutablePureComponent {
static contextTypes = {
@@ 99,3 98,5 @@ class FavouriteModal extends ImmutablePureComponent {
}
}
+
+export default injectIntl(FavouriteModal);
M app/javascript/flavours/glitch/features/ui/components/filter_modal.jsx => app/javascript/flavours/glitch/features/ui/components/filter_modal.jsx +2 -2
@@ 13,8 13,6 @@ const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' },
});
-export default @connect(undefined)
-@injectIntl
class FilterModal extends ImmutablePureComponent {
static propTypes = {
@@ 132,3 130,5 @@ class FilterModal extends ImmutablePureComponent {
}
}
+
+export default connect(injectIntl(FilterModal));
M app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx => app/javascript/flavours/glitch/features/ui/components/focal_point_modal.jsx +4 -2
@@ 99,8 99,6 @@ class ImageLoader extends React.PureComponent {
}
-export default @connect(mapStateToProps, mapDispatchToProps, null, { forwardRef: true })
-@(component => injectIntl(component, { withRef: true }))
class FocalPointModal extends ImmutablePureComponent {
static propTypes = {
@@ 416,3 414,7 @@ class FocalPointModal extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps, null, {
+ forwardRef: true,
+})(injectIntl(FocalPointModal, { withRef: true }));
M app/javascript/flavours/glitch/features/ui/components/follow_requests_column_link.jsx => app/javascript/flavours/glitch/features/ui/components/follow_requests_column_link.jsx +2 -2
@@ 15,8 15,6 @@ const mapStateToProps = state => ({
count: state.getIn(['user_lists', 'follow_requests', 'items'], ImmutableList()).size,
});
-export default @injectIntl
-@connect(mapStateToProps)
class FollowRequestsColumnLink extends React.Component {
static propTypes = {
@@ 49,3 47,5 @@ class FollowRequestsColumnLink extends React.Component {
}
}
+
+export default injectIntl(connect(mapStateToProps)(FollowRequestsColumnLink));
M => +2 -2
@@ 23,8 23,6 @@ const mapDispatchToProps = (dispatch) => ({
},
});
export default @withRouter
@connect(null, mapDispatchToProps)
class Header extends React.PureComponent {
static contextTypes = {
@@ 86,3 84,5 @@ class Header extends React.PureComponent {
}
}
export default withRouter(connect(null, mapDispatchToProps)(Header));
M app/javascript/flavours/glitch/features/ui/components/image_modal.jsx => app/javascript/flavours/glitch/features/ui/components/image_modal.jsx +2 -1
@@ 9,7 9,6 @@ const messages = defineMessages({
close: { id: 'lightbox.close', defaultMessage: 'Close' },
});
-export default @injectIntl
class ImageModal extends React.PureComponent {
static propTypes = {
@@ 57,3 56,5 @@ class ImageModal extends React.PureComponent {
}
}
+
+export default injectIntl(ImageModal);
M => +2 -2
@@ 24,8 24,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
},
});
export default @injectIntl
@connect(null, mapDispatchToProps)
class LinkFooter extends React.PureComponent {
static contextTypes = {
@@ 100,3 98,5 @@ class LinkFooter extends React.PureComponent {
}
}
export default injectIntl(connect(null, mapDispatchToProps)(LinkFooter));
M app/javascript/flavours/glitch/features/ui/components/list_panel.jsx => app/javascript/flavours/glitch/features/ui/components/list_panel.jsx +2 -2
@@ 20,8 20,6 @@ const mapStateToProps = state => ({
lists: getOrderedLists(state),
});
-export default @withRouter
-@connect(mapStateToProps)
class ListPanel extends ImmutablePureComponent {
static propTypes = {
@@ 53,3 51,5 @@ class ListPanel extends ImmutablePureComponent {
}
}
+
+export default withRouter(connect(mapStateToProps)(ListPanel));
M app/javascript/flavours/glitch/features/ui/components/media_modal.jsx => app/javascript/flavours/glitch/features/ui/components/media_modal.jsx +2 -2
@@ 25,8 25,6 @@ const mapStateToProps = (state, { statusId }) => ({
language: state.getIn(['statuses', statusId, 'language']),
});
-export default @connect(mapStateToProps, null, null, { forwardRef: true })
-@injectIntl
class MediaModal extends ImmutablePureComponent {
static contextTypes = {
@@ 259,3 257,5 @@ class MediaModal extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, null, null, { forwardRef: true })(injectIntl(MediaModal));
M app/javascript/flavours/glitch/features/ui/components/mute_modal.jsx => app/javascript/flavours/glitch/features/ui/components/mute_modal.jsx +2 -2
@@ 43,8 43,6 @@ const mapDispatchToProps = dispatch => {
};
};
-export default @connect(mapStateToProps, mapDispatchToProps)
-@injectIntl
class MuteModal extends React.PureComponent {
static propTypes = {
@@ 138,3 136,5 @@ class MuteModal extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(MuteModal));
M app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx => app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx +2 -1
@@ 29,7 29,6 @@ const messages = defineMessages({
app_settings: { id: 'navigation_bar.app_settings', defaultMessage: 'App settings' },
});
-export default @injectIntl
class NavigationPanel extends React.Component {
static contextTypes = {
@@ 102,3 101,5 @@ class NavigationPanel extends React.Component {
}
}
+
+export default injectIntl(NavigationPanel);
M app/javascript/flavours/glitch/features/ui/components/onboarding_modal.jsx => app/javascript/flavours/glitch/features/ui/components/onboarding_modal.jsx +2 -2
@@ 170,8 170,6 @@ const mapStateToProps = state => ({
domain: state.getIn(['meta', 'domain']),
});
-export default @connect(mapStateToProps)
-@injectIntl
class OnboardingModal extends React.PureComponent {
static propTypes = {
@@ 319,3 317,5 @@ class OnboardingModal extends React.PureComponent {
}
}
+
+export default connect(mapStateToProps)(injectIntl(OnboardingModal));
M app/javascript/flavours/glitch/features/ui/components/report_modal.jsx => app/javascript/flavours/glitch/features/ui/components/report_modal.jsx +2 -2
@@ 31,8 31,6 @@ const makeMapStateToProps = () => {
return mapStateToProps;
};
-export default @connect(makeMapStateToProps)
-@injectIntl
class ReportModal extends ImmutablePureComponent {
static propTypes = {
@@ 219,3 217,5 @@ class ReportModal extends ImmutablePureComponent {
}
}
+
+export default connect(makeMapStateToProps)(injectIntl(ReportModal));
M app/javascript/flavours/glitch/features/ui/components/video_modal.jsx => app/javascript/flavours/glitch/features/ui/components/video_modal.jsx +2 -1
@@ 11,7 11,6 @@ const mapStateToProps = (state, { statusId }) => ({
language: state.getIn(['statuses', statusId, 'language']),
});
-export default @connect(mapStateToProps, null, null, { forwardRef: true })
class VideoModal extends ImmutablePureComponent {
static contextTypes = {
@@ 72,3 71,5 @@ class VideoModal extends ImmutablePureComponent {
}
}
+
+export default connect(mapStateToProps, null, null, { forwardRef: true })(VideoModal);
M app/javascript/flavours/glitch/features/ui/components/zoomable_image.jsx => app/javascript/flavours/glitch/features/ui/components/zoomable_image.jsx +2 -1
@@ 91,7 91,6 @@ const normalizeWheel = event => {
};
};
-export default @injectIntl
class ZoomableImage extends React.PureComponent {
static propTypes = {
@@ 451,3 450,5 @@ class ZoomableImage extends React.PureComponent {
}
}
+
+export default injectIntl(ZoomableImage);
M app/javascript/flavours/glitch/features/ui/index.jsx => app/javascript/flavours/glitch/features/ui/index.jsx +2 -3
@@ 244,9 244,6 @@ class SwitchingColumnsArea extends React.PureComponent {
}
-export default @connect(mapStateToProps)
-@injectIntl
-@withRouter
class UI extends React.Component {
static contextTypes = {
@@ 683,3 680,5 @@ class UI extends React.Component {
}
}
+
+export default connect(mapStateToProps)(injectIntl(withRouter(UI)));
M app/javascript/flavours/glitch/features/video/index.jsx => app/javascript/flavours/glitch/features/video/index.jsx +2 -1
@@ 93,7 93,6 @@ export const fileNameFromURL = str => {
return pathname.slice(index + 1);
};
-export default @injectIntl
class Video extends React.PureComponent {
static propTypes = {
@@ 673,3 672,5 @@ class Video extends React.PureComponent {
}
}
+
+export default injectIntl(Video);