diff options
author | Lukas Eipert <leipert@gitlab.com> | 2018-05-11 10:41:37 +0000 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-05-11 10:41:37 +0000 |
commit | 2034cec8e1c02a64333e59cc9e4ef7fac0c3ff2e (patch) | |
tree | 184ec0be2b9e53b1ad73a83ef0496d9b1a038a96 /app/assets/javascripts/user_callout.js | |
parent | f1a2ada1c07a66d7bd0475748527b36e8c26bf62 (diff) | |
download | gitlab-ce-2034cec8e1c02a64333e59cc9e4ef7fac0c3ff2e.tar.gz |
Support `js-close` as a removal class in UserCallout
Diffstat (limited to 'app/assets/javascripts/user_callout.js')
-rw-r--r-- | app/assets/javascripts/user_callout.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app/assets/javascripts/user_callout.js b/app/assets/javascripts/user_callout.js index 97d5cf96bcb..96dfff77859 100644 --- a/app/assets/javascripts/user_callout.js +++ b/app/assets/javascripts/user_callout.js @@ -15,7 +15,7 @@ export default class UserCallout { init() { if (!this.isCalloutDismissed || this.isCalloutDismissed === 'false') { - $('.js-close-callout').on('click', e => this.dismissCallout(e)); + this.userCalloutBody.find('.js-close-callout').on('click', e => this.dismissCallout(e)); } } @@ -23,12 +23,15 @@ export default class UserCallout { const $currentTarget = $(e.currentTarget); if (this.options.setCalloutPerProject) { - Cookies.set(this.cookieName, 'true', { expires: 365, path: this.userCalloutBody.data('projectPath') }); + Cookies.set(this.cookieName, 'true', { + expires: 365, + path: this.userCalloutBody.data('projectPath'), + }); } else { Cookies.set(this.cookieName, 'true', { expires: 365 }); } - if ($currentTarget.hasClass('close')) { + if ($currentTarget.hasClass('close') || $currentTarget.hasClass('js-close')) { this.userCalloutBody.remove(); } } |