mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-24 21:45:06 +01:00
Code Issues Projects Releases Wiki Activity

Fix mark as read in notifications to be saved immediately (#14907)

Browse Source 
* Fix mark as read in notifications to be saved immediately

* fix code style
This commit is contained in:
Takeshi Umeda 2020-10-01 11:17:46 +09:00 committed by GitHub
parent 65136600e3
commit bec8b12bb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/mastodon/actions/markers.js
View File

@ -100,8 +100,12 @@ export function submitMarkersSuccess({ home, notifications }) {
}; };
}; };
export function submitMarkers() { export function submitMarkers(params = {}) {
return (dispatch, getState) => debouncedSubmitMarkers(dispatch, getState); const result = (dispatch, getState) => debouncedSubmitMarkers(dispatch, getState);
if (params.immediate === true) {
debouncedSubmitMarkers.flush();
}
return result;
}; };
export const fetchMarkers = () => (dispatch, getState) => { export const fetchMarkers = () => (dispatch, getState) => {

2
app/javascript/mastodon/features/notifications/index.js
View File

@ -12,6 +12,7 @@ import {
unmountNotifications, unmountNotifications,
markNotificationsAsRead, markNotificationsAsRead,
} from '../../actions/notifications'; } from '../../actions/notifications';
import { submitMarkers } from '../../actions/markers';
import { addColumn, removeColumn, moveColumn } from '../../actions/columns'; import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
import NotificationContainer from './containers/notification_container'; import NotificationContainer from './containers/notification_container';
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
@ -162,6 +163,7 @@ class Notifications extends React.PureComponent {
handleMarkAsRead = () => { handleMarkAsRead = () => {
this.props.dispatch(markNotificationsAsRead()); this.props.dispatch(markNotificationsAsRead());
this.props.dispatch(submitMarkers({ immediate: true }));
}; };
render () { render () {

2
app/javascript/mastodon/features/ui/index.js
View File

@ -266,7 +266,7 @@ class UI extends React.PureComponent {
handleWindowFocus = () => { handleWindowFocus = () => {
this.props.dispatch(focusApp()); this.props.dispatch(focusApp());
this.props.dispatch(submitMarkers()); this.props.dispatch(submitMarkers({ immediate: true }));
} }
handleWindowBlur = () => { handleWindowBlur = () => {