From b6bf04ece2e0e9602a84ef48fe6a04f505680c03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= Date: Sun, 6 Aug 2017 21:27:47 +0200 Subject: [PATCH] Added data-column="{account|local|federated|favourites|hashtag|home|notifications|mutes|blocks|getting-started|follow-requests}" to Column --- app/javascript/mastodon/components/column.js | 5 +++-- app/javascript/mastodon/features/account_timeline/index.js | 2 +- app/javascript/mastodon/features/blocks/index.js | 2 +- app/javascript/mastodon/features/community_timeline/index.js | 2 +- .../mastodon/features/favourited_statuses/index.js | 2 +- app/javascript/mastodon/features/follow_requests/index.js | 4 ++-- app/javascript/mastodon/features/getting_started/index.js | 2 +- app/javascript/mastodon/features/hashtag_timeline/index.js | 2 +- app/javascript/mastodon/features/home_timeline/index.js | 2 +- app/javascript/mastodon/features/mutes/index.js | 2 +- app/javascript/mastodon/features/notifications/index.js | 1 + app/javascript/mastodon/features/public_timeline/index.js | 2 +- app/javascript/mastodon/features/ui/components/column.js | 4 +++- 13 files changed, 18 insertions(+), 14 deletions(-) diff --git a/app/javascript/mastodon/components/column.js b/app/javascript/mastodon/components/column.js index 29c8f43899a..c7a93156298 100644 --- a/app/javascript/mastodon/components/column.js +++ b/app/javascript/mastodon/components/column.js @@ -8,6 +8,7 @@ export default class Column extends React.PureComponent { static propTypes = { children: PropTypes.node, extraClasses: PropTypes.string, + name: PropTypes.string, }; scrollTop () { @@ -41,10 +42,10 @@ export default class Column extends React.PureComponent { } render () { - const { children, extraClasses } = this.props; + const { children, extraClasses, name } = this.props; return ( -
+
{children}
); diff --git a/app/javascript/mastodon/features/account_timeline/index.js b/app/javascript/mastodon/features/account_timeline/index.js index 3c8b63114f6..cbe66d6358e 100644 --- a/app/javascript/mastodon/features/account_timeline/index.js +++ b/app/javascript/mastodon/features/account_timeline/index.js @@ -61,7 +61,7 @@ export default class AccountTimeline extends ImmutablePureComponent { } return ( - + +
diff --git a/app/javascript/mastodon/features/community_timeline/index.js b/app/javascript/mastodon/features/community_timeline/index.js index 0e2300f8ce1..27f977e8542 100644 --- a/app/javascript/mastodon/features/community_timeline/index.js +++ b/app/javascript/mastodon/features/community_timeline/index.js @@ -117,7 +117,7 @@ export default class CommunityTimeline extends React.PureComponent { const pinned = !!columnId; return ( - + + + ); } return ( - + diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js index 684612b1c4f..e4d9262a047 100644 --- a/app/javascript/mastodon/features/getting_started/index.js +++ b/app/javascript/mastodon/features/getting_started/index.js @@ -85,7 +85,7 @@ export default class GettingStarted extends ImmutablePureComponent { ]); return ( - +
diff --git a/app/javascript/mastodon/features/hashtag_timeline/index.js b/app/javascript/mastodon/features/hashtag_timeline/index.js index b17e8e1a5b5..89382bb14df 100644 --- a/app/javascript/mastodon/features/hashtag_timeline/index.js +++ b/app/javascript/mastodon/features/hashtag_timeline/index.js @@ -112,7 +112,7 @@ export default class HashtagTimeline extends React.PureComponent { const pinned = !!columnId; return ( - + + +
diff --git a/app/javascript/mastodon/features/notifications/index.js b/app/javascript/mastodon/features/notifications/index.js index 0d86d41cee6..97c3f29ae45 100644 --- a/app/javascript/mastodon/features/notifications/index.js +++ b/app/javascript/mastodon/features/notifications/index.js @@ -183,6 +183,7 @@ export default class Notifications extends React.PureComponent { return ( + { @@ -36,7 +37,7 @@ export default class Column extends React.PureComponent { } render () { - const { heading, icon, children, active, hideHeadingOnMobile } = this.props; + const { heading, icon, children, active, hideHeadingOnMobile, name } = this.props; const showHeading = heading && (!hideHeadingOnMobile || (hideHeadingOnMobile && !isMobile(window.innerWidth))); @@ -48,6 +49,7 @@ export default class Column extends React.PureComponent {