diff options
| author | Matthew Walsh <mattwcstrfan@gmail.com> | 2017-10-22 18:45:35 -0700 |
|---|---|---|
| committer | Matthew Walsh <mattwcstrfan@gmail.com> | 2017-10-22 18:45:35 -0700 |
| commit | a76b02422847c5d5996c03284f3dd5e662bbfb9d (patch) | |
| tree | 4da67a654cd02b1835eb8d8d824e1a6184926741 /app/javascript | |
| parent | 3db80f75a6d76a7eea576413c5ae9b206d2ab385 (diff) | |
Changes to match other timelines in 2.0
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/mastodon/actions/compose.js | 3 | ||||
| -rw-r--r-- | app/javascript/mastodon/features/ui/index.js | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js index 278fbc898..25fb1aa83 100644 --- a/app/javascript/mastodon/actions/compose.js +++ b/app/javascript/mastodon/actions/compose.js @@ -8,6 +8,7 @@ import { refreshHomeTimeline, refreshCommunityTimeline, refreshPublicTimeline, + refreshDirectTimeline, } from './timelines'; export const COMPOSE_CHANGE = 'COMPOSE_CHANGE'; @@ -129,7 +130,7 @@ export function submitCompose() { insertOrRefresh('community', refreshCommunityTimeline); insertOrRefresh('public', refreshPublicTimeline); } else if (response.data.visibility === 'direct') { - dispatch(updateTimeline('direct', { ...response.data })); + insertOrRefresh('direct', refreshDirectTimeline); } }).catch(function (error) { dispatch(submitComposeFail(error)); diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js index cf51f0fb6..a0f5a86b0 100644 --- a/app/javascript/mastodon/features/ui/index.js +++ b/app/javascript/mastodon/features/ui/index.js @@ -67,6 +67,7 @@ const keyMap = { goToNotifications: 'g n', goToLocal: 'g l', goToFederated: 'g t', + goToDirect: 'g d', goToStart: 'g s', goToFavourites: 'g f', goToPinned: 'g p', @@ -293,6 +294,10 @@ export default class UI extends React.Component { this.context.router.history.push('/timelines/public'); } + handleHotkeyGoToDirect = () => { + this.context.router.history.push('/timelines/direct'); + } + handleHotkeyGoToStart = () => { this.context.router.history.push('/getting-started'); } @@ -331,6 +336,7 @@ export default class UI extends React.Component { goToNotifications: this.handleHotkeyGoToNotifications, goToLocal: this.handleHotkeyGoToLocal, goToFederated: this.handleHotkeyGoToFederated, + goToDirect: this.handleHotkeyGoToDirect, goToStart: this.handleHotkeyGoToStart, goToFavourites: this.handleHotkeyGoToFavourites, goToPinned: this.handleHotkeyGoToPinned, |