treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix #620 - Add confirmation dialog for notifications clear

lolsob-rspec
Eugen Rochko 2017-03-02 19:24:12 +01:00
parent 7a3d1e23d1
commit c9e2dc6337
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/components/features/notifications/components/clear_column_button.jsx
View File

@ -4,7 +4,8 @@ const iconStyle = {
position: 'absolute',
right: '48px',
top: '0',
cursor: 'pointer'
cursor: 'pointer',
zIndex: '2'
};
const ClearColumnButton = ({ onClick }) => (

7
app/assets/javascripts/components/features/notifications/index.jsx
View File

@ -13,7 +13,8 @@ import LoadMore from '../../components/load_more';
import ClearColumnButton from './components/clear_column_button';
const messages = defineMessages({
title: { id: 'column.notifications', defaultMessage: 'Notifications' }
title: { id: 'column.notifications', defaultMessage: 'Notifications' },
confirm: { id: 'confirmation.label', defaultMessage: 'Are you sure?' }
});
const getNotifications = createSelector([
@ -72,7 +73,9 @@ const Notifications = React.createClass({
},
handleClear () {
this.props.dispatch(clearNotifications());
if (window.confirm(this.props.intl.formatMessage(messages.confirm))) {
this.props.dispatch(clearNotifications());
}
},
setRef (c) {