diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2017-02-08 00:07:14 +0000 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2017-02-08 00:07:14 +0000 |
commit | f00f3f0743392bd59947354526c0221083dc204c (patch) | |
tree | 77eb7cf3840a1b1ed77a4cc113d4e2449164ecf4 /app | |
parent | f6433c54b1fb87a51956bd1cd3ce1667054dfd31 (diff) | |
parent | e0a900630c7c61d8c3738440dfb87bb24ebf99d7 (diff) | |
download | gitlab-ce-f00f3f0743392bd59947354526c0221083dc204c.tar.gz |
Merge branch 'no-sidebar-on-action-btn-click' into 'master'
dismiss sidebar on action button click
Closes #27227
See merge request !8798
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/sidebar.js.es6 | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/app/assets/javascripts/sidebar.js.es6 b/app/assets/javascripts/sidebar.js.es6 index ee172f2fa6f..cbb2ae9f1bd 100644 --- a/app/assets/javascripts/sidebar.js.es6 +++ b/app/assets/javascripts/sidebar.js.es6 @@ -1,9 +1,7 @@ /* eslint-disable arrow-parens, class-methods-use-this, no-param-reassign */ /* global Cookies */ -((global) => { - let singleton; - +(() => { const pinnedStateCookie = 'pin_nav'; const sidebarBreakpoint = 1024; @@ -23,11 +21,12 @@ class Sidebar { constructor() { - if (!singleton) { - singleton = this; - singleton.init(); + if (!Sidebar.singleton) { + Sidebar.singleton = this; + Sidebar.singleton.init(); } - return singleton; + + return Sidebar.singleton; } init() { @@ -39,7 +38,7 @@ $(document) .on('click', sidebarToggleSelector, () => this.toggleSidebar()) .on('click', pinnedToggleSelector, () => this.togglePinnedState()) - .on('click', 'html, body', (e) => this.handleClickEvent(e)) + .on('click', 'html, body, a, button', (e) => this.handleClickEvent(e)) .on('DOMContentLoaded', () => this.renderState()) .on('todo:toggle', (e, count) => this.updateTodoCount(count)); this.renderState(); @@ -88,10 +87,12 @@ $pinnedToggle.attr('title', tooltipText).tooltip('fixTitle').tooltip(tooltipState); if (this.isExpanded) { - setTimeout(() => $(sidebarContentSelector).niceScroll().updateScrollBar(), 200); + const sidebarContent = $(sidebarContentSelector); + setTimeout(() => { sidebarContent.niceScroll().updateScrollBar(); }, 200); } } } - global.Sidebar = Sidebar; -})(window.gl || (window.gl = {})); + window.gl = window.gl || {}; + gl.Sidebar = Sidebar; +})(); |