Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Re-add clear notifications button (#3708)

Browse source 
* Re-add clear notifications button

* remove connect() in column_settings

* one line

* remove unused props
This commit is contained in:
Yamagishi Kazutoshi 2017-06-12 19:26:23 +09:00 • committed by Eugen Rochko
parent abbdacedc5
commit 72133fbed6
32 changed files with 46 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/javascript/mastodon/features/notifications/containers/column_settings_container.js
View file

@ -1,12 +1,20 @@
import { connect } from 'react-redux';
import { defineMessages, injectIntl } from 'react-intl';
import ColumnSettings from '../components/column_settings';
import { changeSetting, saveSettings } from '../../../actions/settings';
import { clearNotifications } from '../../../actions/notifications';
import { openModal } from '../../../actions/modal';
const messages = defineMessages({
clearMessage: { id: 'notifications.clear_confirmation', defaultMessage: 'Are you sure you want to permanently clear all your notifications?' },
clearConfirm: { id: 'notifications.clear', defaultMessage: 'Clear notifications' },
});
const mapStateToProps = state => ({
settings: state.getIn(['settings', 'notifications']),
});
const mapDispatchToProps = dispatch => ({
const mapDispatchToProps = (dispatch, { intl }) => ({
onChange (key, checked) {
dispatch(changeSetting(['notifications', ...key], checked));
@ -16,6 +24,14 @@ const mapDispatchToProps = dispatch => ({
dispatch(saveSettings());
},
onClear () {
dispatch(openModal('CONFIRM', {
message: intl.formatMessage(messages.clearMessage),
confirm: intl.formatMessage(messages.clearConfirm),
onConfirm: () => dispatch(clearNotifications()),
}));
},
});
export default connect(mapStateToProps, mapDispatchToProps)(ColumnSettings);
export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(ColumnSettings));