diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 03:07:49 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 03:07:49 +0300 |
commit | 77237c5a6b9044f58beabc54d3589e5fa09cbfba (patch) | |
tree | f43188047fe8955f6cf78e05ae9c2e8f6a019e0b /app/assets/javascripts | |
parent | 2fd92f2dc784ade9cb4e1c33dd60cbfad7b86818 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/broadcast_notification.js | 10 | ||||
-rw-r--r-- | app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/broadcast_notification.js b/app/assets/javascripts/broadcast_notification.js index b124502506a..dc5401199dc 100644 --- a/app/assets/javascripts/broadcast_notification.js +++ b/app/assets/javascripts/broadcast_notification.js @@ -6,16 +6,14 @@ const handleOnDismiss = ({ currentTarget }) => { dataset: { id }, } = currentTarget; - Cookies.set(`hide_broadcast_notification_message_${id}`, true); + Cookies.set(`hide_broadcast_message_${id}`, true); const notification = document.querySelector(`.js-broadcast-notification-${id}`); notification.parentNode.removeChild(notification); }; export default () => { - const dismissButton = document.querySelector('.js-dismiss-current-broadcast-notification'); - - if (dismissButton) { - dismissButton.addEventListener('click', handleOnDismiss); - } + document + .querySelectorAll('.js-dismiss-current-broadcast-notification') + .forEach(dismissButton => dismissButton.addEventListener('click', handleOnDismiss)); }; diff --git a/app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js b/app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js index d191479b1b4..34a024b1b33 100644 --- a/app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js +++ b/app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js @@ -25,9 +25,11 @@ export default () => { $broadcastMessageType.on('change', () => { const $broadcastMessageColorFormGroup = $('.js-broadcast-message-background-color-form-group'); + const $broadcastMessageDismissableFormGroup = $('.js-broadcast-message-dismissable-form-group'); const $broadcastNotificationMessagePreview = $('.js-broadcast-notification-message-preview'); $broadcastMessageColorFormGroup.toggleClass('hidden'); + $broadcastMessageDismissableFormGroup.toggleClass('hidden'); $broadcastBannerMessagePreview.toggleClass('hidden'); $broadcastNotificationMessagePreview.toggleClass('hidden'); }); |