From b9345b3fc60c5d48828af422d3ee027abc2dea82 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 2 Mar 2017 19:24:12 +0100
Subject: [PATCH] Fix #620 - Add confirmation dialog for notifications clear
---
.../notifications/components/clear_column_button.jsx | 3 ++-
.../components/features/notifications/index.jsx | 7 +++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/app/assets/javascripts/components/features/notifications/components/clear_column_button.jsx b/app/assets/javascripts/components/features/notifications/components/clear_column_button.jsx
index 0b7c737c6b..d75149a0e3 100644
--- a/app/assets/javascripts/components/features/notifications/components/clear_column_button.jsx
+++ b/app/assets/javascripts/components/features/notifications/components/clear_column_button.jsx
@@ -4,7 +4,8 @@ const iconStyle = {
position: 'absolute',
right: '48px',
top: '0',
- cursor: 'pointer'
+ cursor: 'pointer',
+ zIndex: '2'
};
const ClearColumnButton = ({ onClick }) => (
diff --git a/app/assets/javascripts/components/features/notifications/index.jsx b/app/assets/javascripts/components/features/notifications/index.jsx
index 0da3544f6b..8d3f4233df 100644
--- a/app/assets/javascripts/components/features/notifications/index.jsx
+++ b/app/assets/javascripts/components/features/notifications/index.jsx
@@ -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) {
--
GitLab