gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/kb_development' into kb_migration

Browse source
This commit is contained in:
KMY 2023-03-19 13:09:14 +09:00
commit 1f388900a8
14 changed files with 341 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/features/ui/components/columns_area.jsx
View file

@ -15,6 +15,7 @@ import {
HashtagTimeline,
DirectTimeline,
FavouritedStatuses,
EmojiReactedStatuses,
BookmarkedStatuses,
ListTimeline,
Directory,
@ -34,6 +35,7 @@ const componentMap = {
'HASHTAG': HashtagTimeline,
'DIRECT': DirectTimeline,
'FAVOURITES': FavouritedStatuses,
'EMOJI_REACTIONS': EmojiReactedStatuses,
'BOOKMARKS': BookmarkedStatuses,
'LIST': ListTimeline,
'DIRECTORY': Directory,

8
app/javascript/mastodon/features/ui/index.jsx
View file

@ -42,6 +42,7 @@ import {
Notifications,
FollowRequests,
FavouritedStatuses,
EmojiReactedStatuses,
BookmarkedStatuses,
FollowedTags,
ListTimeline,
@ -102,6 +103,7 @@ const keyMap = {
goToDirect: 'g d',
goToStart: 'g s',
goToFavourites: 'g f',
goToEmojiReactions: 'g e',
goToPinned: 'g p',
goToProfile: 'g u',
goToBlocked: 'g b',
@ -189,6 +191,7 @@ class SwitchingColumnsArea extends React.PureComponent {
<WrappedRoute path='/lists/:id' component={ListTimeline} content={children} />
<WrappedRoute path='/notifications' component={Notifications} content={children} />
<WrappedRoute path='/favourites' component={FavouritedStatuses} content={children} />
<WrappedRoute path='/emoji_reactions' component={EmojiReactedStatuses} content={children} />
<WrappedRoute path='/bookmarks' component={BookmarkedStatuses} content={children} />
<WrappedRoute path='/pinned' component={PinnedStatuses} content={children} />
@ -525,6 +528,10 @@ class UI extends React.PureComponent {
this.context.router.history.push('/favourites');
};
handleHotkeyGoToEmojiReactions = () => {
this.context.router.history.push('/emoji_reactions');
};
handleHotkeyGoToPinned = () => {
this.context.router.history.push('/pinned');
};
@ -564,6 +571,7 @@ class UI extends React.PureComponent {
goToDirect: this.handleHotkeyGoToDirect,
goToStart: this.handleHotkeyGoToStart,
goToFavourites: this.handleHotkeyGoToFavourites,
goToEmojiReactions: this.handleHotkeyGoToEmojiReactions,
goToPinned: this.handleHotkeyGoToPinned,
goToProfile: this.handleHotkeyGoToProfile,
goToBlocked: this.handleHotkeyGoToBlocked,

4
app/javascript/mastodon/features/ui/util/async-components.js
View file

@ -94,6 +94,10 @@ export function FavouritedStatuses () {
return import(/* webpackChunkName: "features/favourited_statuses" */'../../favourited_statuses');
}
export function EmojiReactedStatuses () {
return import(/* webpackChunkName: "features/emoji_reacted_statuses" */'../../emoji_reacted_statuses');
}
export function FollowedTags () {
return import(/* webpackChunkName: "features/followed_tags" */'../../followed_tags');
}