diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-02 03:06:26 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-02 03:06:26 +0300 |
commit | 587794b4b8a6e919e77ee4abe8215fa291e6a91d (patch) | |
tree | 380d6578d1ab5902bb521071128bafd4f70472ef /app/assets/javascripts/flash.js | |
parent | e0bd3a45d9dc6c74cac1a33ea8c03d6d8334249b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/flash.js')
-rw-r--r-- | app/assets/javascripts/flash.js | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/app/assets/javascripts/flash.js b/app/assets/javascripts/flash.js index 660f0f0ba3e..fc9c5827ed4 100644 --- a/app/assets/javascripts/flash.js +++ b/app/assets/javascripts/flash.js @@ -40,13 +40,17 @@ const createFlashEl = (message, type) => ` <div class="flash-content flash-${type} rounded"> <div class="flash-text"> ${_.escape(message)} - ${spriteIcon('close', 'close-icon')} + <div class="close-icon-wrapper js-close-icon"> + ${spriteIcon('close', 'close-icon')} + </div> </div> </div> `; const removeFlashClickListener = (flashEl, fadeTransition) => { - flashEl.addEventListener('click', () => hideFlash(flashEl, fadeTransition)); + flashEl + .querySelector('.js-close-icon') + .addEventListener('click', () => hideFlash(flashEl, fadeTransition)); }; /* @@ -78,7 +82,6 @@ const createFlash = function createFlash( flashContainer.innerHTML = createFlashEl(message, type); const flashEl = flashContainer.querySelector(`.flash-${type}`); - removeFlashClickListener(flashEl, fadeTransition); if (actionConfig) { flashEl.innerHTML += createAction(actionConfig); @@ -90,6 +93,8 @@ const createFlash = function createFlash( } } + removeFlashClickListener(flashEl, fadeTransition); + flashContainer.style.display = 'block'; if (addBodyClass) document.body.classList.add('flash-shown'); |