diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-15 15:56:02 -0600 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-15 17:16:13 -0600 |
commit | 06239e13e580e0a3e6020f2e3b4e8d5d03d7ab92 (patch) | |
tree | ff21efd41de20a65e76abc21ad17166f9af0f9d8 /app/assets | |
parent | 20d613639bd90d9f3379d4665a2e3adc5f6b8b17 (diff) | |
download | gitlab-ce-06239e13e580e0a3e6020f2e3b4e8d5d03d7ab92.tar.gz |
Move necessary sidebar code to right_sidebar.js; delete sidebar.js
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/application.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/right_sidebar.js | 12 | ||||
-rw-r--r-- | app/assets/javascripts/sidebar.js.es6 | 20 |
3 files changed, 12 insertions, 22 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 3c1d65b8e67..5d7350ad7be 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -240,8 +240,6 @@ require('es6-promise').polyfill(); }); gl.awardsHandler = new AwardsHandler(); new Aside(); - // bind sidebar events - new gl.Sidebar(); gl.utils.initTimeagoTimeout(); }); diff --git a/app/assets/javascripts/right_sidebar.js b/app/assets/javascripts/right_sidebar.js index 76a0f993ea0..82c17956f06 100644 --- a/app/assets/javascripts/right_sidebar.js +++ b/app/assets/javascripts/right_sidebar.js @@ -25,6 +25,8 @@ $('.dropdown').on('hidden.gl.dropdown', this, this.onSidebarDropdownHidden); $('.dropdown').on('loading.gl.dropdown', this.sidebarDropdownLoading); $('.dropdown').on('loaded.gl.dropdown', this.sidebarDropdownLoaded); + $(window).on('resize', () => this.setSidebarHeight()); + $(document).on('scroll', () => this.setSidebarHeight()); $(document).on('click', '.js-sidebar-toggle', function(e, triggered) { var $allGutterToggleIcons, $this, $thisIcon; e.preventDefault(); @@ -191,6 +193,16 @@ } }; + Sidebar.prototype.setSidebarHeight = function() { + const $navHeight = $('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight(); + const diff = $navHeight - $('body').scrollTop(); + if (diff > 0) { + $('.js-right-sidebar').outerHeight($(window).height() - diff); + } else { + $('.js-right-sidebar').outerHeight('100%'); + } + }; + Sidebar.prototype.isOpen = function() { return this.sidebar.is('.right-sidebar-expanded'); }; diff --git a/app/assets/javascripts/sidebar.js.es6 b/app/assets/javascripts/sidebar.js.es6 deleted file mode 100644 index cd0aa9be6e5..00000000000 --- a/app/assets/javascripts/sidebar.js.es6 +++ /dev/null @@ -1,20 +0,0 @@ -/* eslint-disable arrow-parens, class-methods-use-this, no-param-reassign */ -/* global Cookies */ - -(() => { - class Sidebar { - - setSidebarHeight() { - const $navHeight = $('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight(); - const diff = $navHeight - $('body').scrollTop(); - if (diff > 0) { - $('.js-right-sidebar').outerHeight($(window).height() - diff); - } else { - $('.js-right-sidebar').outerHeight('100%'); - } - } - } - - window.gl = window.gl || {}; - gl.Sidebar = Sidebar; -})(); |