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

16
app/javascript/mastodon/features/notifications/index.js
View file

@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes';
import Column from '../../components/column';
import ColumnHeader from '../../components/column_header';
import { expandNotifications, clearNotifications, scrollTopNotifications } from '../../actions/notifications';
import { expandNotifications, scrollTopNotifications } from '../../actions/notifications';
import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
import NotificationContainer from './containers/notification_container';
import { ScrollContainer } from 'react-router-scroll';
@ -13,13 +13,9 @@ import ColumnSettingsContainer from './containers/column_settings_container';
import { createSelector } from 'reselect';
import Immutable from 'immutable';
import LoadMore from '../../components/load_more';
import ClearColumnButton from './components/clear_column_button';
import { openModal } from '../../actions/modal';
const messages = defineMessages({
title: { id: 'column.notifications', defaultMessage: 'Notifications' },
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 getNotifications = createSelector([
@ -79,16 +75,6 @@ class Notifications extends React.PureComponent {
this.props.dispatch(expandNotifications());
}
handleClear = () => {
const { dispatch, intl } = this.props;
dispatch(openModal('CONFIRM', {
message: intl.formatMessage(messages.clearMessage),
confirm: intl.formatMessage(messages.clearConfirm),
onConfirm: () => dispatch(clearNotifications()),
}));
}
handlePin = () => {
const { columnId, dispatch } = this.props;