diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-04 15:08:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-04 15:08:21 +0300 |
commit | 63546c0b11e768f1a82dee9507f27bd31a9fc460 (patch) | |
tree | 7284dadf385aa01a69c319dfb3566873e434df18 /app/assets/javascripts/user_callout.js | |
parent | b3ce1ce45218454cc3f8b719d7748f8a467f36a3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/user_callout.js')
-rw-r--r-- | app/assets/javascripts/user_callout.js | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/app/assets/javascripts/user_callout.js b/app/assets/javascripts/user_callout.js index 96dfff77859..df00f38dd70 100644 --- a/app/assets/javascripts/user_callout.js +++ b/app/assets/javascripts/user_callout.js @@ -21,16 +21,17 @@ export default class UserCallout { dismissCallout(e) { const $currentTarget = $(e.currentTarget); + const cookieOptions = {}; + if (!$currentTarget.hasClass('js-close-session')) { + cookieOptions.expires = 365; + } if (this.options.setCalloutPerProject) { - Cookies.set(this.cookieName, 'true', { - expires: 365, - path: this.userCalloutBody.data('projectPath'), - }); - } else { - Cookies.set(this.cookieName, 'true', { expires: 365 }); + cookieOptions.path = this.userCalloutBody.data('projectPath'); } + Cookies.set(this.cookieName, 'true', cookieOptions); + if ($currentTarget.hasClass('close') || $currentTarget.hasClass('js-close')) { this.userCalloutBody.remove(); } |