diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-20 14:32:29 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-20 14:32:29 +0000 |
| commit | 699badabc9670e836eafaf1c66248f49ea41a098 (patch) | |
| tree | 9442c8010fc76f87204f095be3643009fbc896ec /app | |
| parent | 3c9c1b6c16f21aebfbb897c9611197fc9cf6f870 (diff) | |
| parent | a0173bc46fdb18861fc65fe538b87499d5679c92 (diff) | |
| download | gitlab-ce-699badabc9670e836eafaf1c66248f49ea41a098.tar.gz | |
Merge branch 'pinned-nav-cookie-path' into 'master'
Set path for pinned nav cookie
## What does this MR do?
Sets a path for the pinned nav cookie so it will be present across page reload.
Closes #18836
See merge request !4784
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index 2f9f6c3ef5b..4529c514555 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -257,7 +257,7 @@ $ -> # Sidenav pinning if $(window).width() < 1440 and $.cookie('pin_nav') is 'true' - $.cookie('pin_nav', 'false') + $.cookie('pin_nav', 'false', { path: '/' }) $('.page-with-sidebar') .toggleClass('page-sidebar-collapsed page-sidebar-expanded') .removeClass('page-sidebar-pinned') @@ -271,7 +271,7 @@ $ -> $(this).toggleClass 'is-active' if $.cookie('pin_nav') is 'true' - $.cookie 'pin_nav', 'false' + $.cookie 'pin_nav', 'false', { path: '/' } $('.page-with-sidebar') .removeClass('page-sidebar-pinned') .toggleClass('page-sidebar-collapsed page-sidebar-expanded') @@ -279,6 +279,6 @@ $ -> .removeClass('header-pinned-nav') .toggleClass('header-collapsed header-expanded') else - $.cookie 'pin_nav', 'true' + $.cookie 'pin_nav', 'true', { path: '/' } $('.page-with-sidebar').addClass('page-sidebar-pinned') $('.navbar-fixed-top').addClass('header-pinned-nav') |