diff options
| author | Phil Hughes <me@iamphill.com> | 2016-06-15 18:33:18 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-06-15 18:33:18 +0100 |
| commit | 7d9157ff47c1380492a64aa3c7a1e1a7fa6b8e37 (patch) | |
| tree | 8fe227aa6d1e8ea423040c19fbc078f719221a50 | |
| parent | 9d74eb462298dc553bdaae81cd6476d6c5a1952c (diff) | |
| download | gitlab-ce-pinned-sidebar.tar.gz | |
Clicking body closes navpinned-sidebar
Fixed issue when nav wasn't present
| -rw-r--r-- | app/assets/javascripts/sidebar.js.coffee | 16 | ||||
| -rw-r--r-- | app/helpers/nav_helper.rb | 3 |
2 files changed, 18 insertions, 1 deletions
diff --git a/app/assets/javascripts/sidebar.js.coffee b/app/assets/javascripts/sidebar.js.coffee index e7471893d2e..68009e58645 100644 --- a/app/assets/javascripts/sidebar.js.coffee +++ b/app/assets/javascripts/sidebar.js.coffee @@ -14,6 +14,22 @@ toggleSidebar = -> niceScrollBars.updateScrollBar(); ), 300 +$(document) + .off 'click', 'body' + .on 'click', 'body', (e) -> + unless $.cookie('pin_nav') is 'true' + $target = $(e.target) + $nav = $target.closest('.sidebar-wrapper') + pageExpanded = $('.page-with-sidebar').hasClass('page-sidebar-expanded') + $toggle = $target.closest('.toggle-nav-collapse, .side-nav-toggle') + + if $nav.length is 0 and pageExpanded and $toggle.length is 0 + $('.page-with-sidebar') + .toggleClass('page-sidebar-collapsed page-sidebar-expanded') + + $('.navbar-fixed-top') + .toggleClass('header-collapsed header-expanded') + $(document).on("click", '.toggle-nav-collapse, .side-nav-toggle', (e) -> e.preventDefault() diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb index d53ee3c45df..3ff8be5e284 100644 --- a/app/helpers/nav_helper.rb +++ b/app/helpers/nav_helper.rb @@ -36,7 +36,8 @@ module NavHelper end def nav_header_class - class_name = " with-horizontal-nav" if defined?(nav) && nav + class_name = '' + class_name << " with-horizontal-nav" if defined?(nav) && nav if pinned_nav? class_name << " header-expanded header-pinned-nav" |