Merge branch 'layout-nav-es-module' into 'master'
Changed layout_nav to ES module See merge request gitlab-org/gitlab-ce!16003
This commit is contained in:
commit
f5290c9738
2 changed files with 33 additions and 42 deletions
|
@ -1,59 +1,51 @@
|
|||
/* eslint-disable func-names, space-before-function-paren, no-var, prefer-arrow-callback, no-unused-vars, one-var, one-var-declaration-per-line, vars-on-top, max-len */
|
||||
import _ from 'underscore';
|
||||
import Cookies from 'js-cookie';
|
||||
import ContextualSidebar from './contextual_sidebar';
|
||||
import initFlyOutNav from './fly_out_nav';
|
||||
|
||||
(function() {
|
||||
var hideEndFade;
|
||||
|
||||
hideEndFade = function($scrollingTabs) {
|
||||
return $scrollingTabs.each(function() {
|
||||
var $this;
|
||||
$this = $(this);
|
||||
return $this.siblings('.fade-right').toggleClass('scrolling', $this.width() < $this.prop('scrollWidth'));
|
||||
function hideEndFade($scrollingTabs) {
|
||||
$scrollingTabs.each(function scrollTabsLoop() {
|
||||
const $this = $(this);
|
||||
$this.siblings('.fade-right').toggleClass('scrolling', $this.width() < $this.prop('scrollWidth'));
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
export default function initLayoutNav() {
|
||||
const contextualSidebar = new ContextualSidebar();
|
||||
contextualSidebar.bindEvents();
|
||||
|
||||
initFlyOutNav();
|
||||
|
||||
$(document).on('init.scrolling-tabs', () => {
|
||||
const $scrollingTabs = $('.scrolling-tabs').not('.is-initialized');
|
||||
$scrollingTabs.addClass('is-initialized');
|
||||
|
||||
$(window).on('resize.nav', () => {
|
||||
hideEndFade($scrollingTabs);
|
||||
$(window).off('resize.nav').on('resize.nav', function() {
|
||||
return hideEndFade($scrollingTabs);
|
||||
});
|
||||
$scrollingTabs.off('scroll').on('scroll', function(event) {
|
||||
var $this, currentPosition, maxPosition;
|
||||
$this = $(this);
|
||||
currentPosition = $this.scrollLeft();
|
||||
maxPosition = $this.prop('scrollWidth') - $this.outerWidth();
|
||||
}).trigger('resize.nav');
|
||||
|
||||
$scrollingTabs.on('scroll', function tabsScrollEvent() {
|
||||
const $this = $(this);
|
||||
const currentPosition = $this.scrollLeft();
|
||||
const maxPosition = $this.prop('scrollWidth') - $this.outerWidth();
|
||||
|
||||
$this.siblings('.fade-left').toggleClass('scrolling', currentPosition > 0);
|
||||
return $this.siblings('.fade-right').toggleClass('scrolling', currentPosition < maxPosition - 1);
|
||||
$this.siblings('.fade-right').toggleClass('scrolling', currentPosition < maxPosition - 1);
|
||||
});
|
||||
|
||||
$scrollingTabs.each(function () {
|
||||
var $this = $(this);
|
||||
var scrollingTabWidth = $this.width();
|
||||
var $active = $this.find('.active');
|
||||
var activeWidth = $active.width();
|
||||
$scrollingTabs.each(function scrollTabsEachLoop() {
|
||||
const $this = $(this);
|
||||
const scrollingTabWidth = $this.width();
|
||||
const $active = $this.find('.active');
|
||||
const activeWidth = $active.width();
|
||||
|
||||
if ($active.length) {
|
||||
var offset = $active.offset().left + activeWidth;
|
||||
const offset = $active.offset().left + activeWidth;
|
||||
|
||||
if (offset > scrollingTabWidth - 30) {
|
||||
var scrollLeft = scrollingTabWidth / 2;
|
||||
scrollLeft = (offset - scrollLeft) - (activeWidth / 2);
|
||||
const scrollLeft = (offset - (scrollingTabWidth / 2)) - (activeWidth / 2);
|
||||
|
||||
$this.scrollLeft(scrollLeft);
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
$(() => {
|
||||
const contextualSidebar = new ContextualSidebar();
|
||||
contextualSidebar.bindEvents();
|
||||
|
||||
initFlyOutNav();
|
||||
});
|
||||
}).call(window);
|
||||
}).trigger('init.scrolling-tabs');
|
||||
}
|
||||
|
|
|
@ -41,7 +41,7 @@ import Flash, { removeFlashClickListener } from './flash';
|
|||
import './gl_dropdown';
|
||||
import initTodoToggle from './header';
|
||||
import initImporterStatus from './importer_status';
|
||||
import './layout_nav';
|
||||
import initLayoutNav from './layout_nav';
|
||||
import LazyLoader from './lazy_loader';
|
||||
import './line_highlighter';
|
||||
import initLogoAnimation from './logo';
|
||||
|
@ -89,6 +89,7 @@ $(function () {
|
|||
var fitSidebarForSize;
|
||||
|
||||
initBreadcrumbs();
|
||||
initLayoutNav();
|
||||
initImporterStatus();
|
||||
initTodoToggle();
|
||||
initLogoAnimation();
|
||||
|
@ -261,8 +262,6 @@ $(function () {
|
|||
|
||||
renderTimeago();
|
||||
|
||||
$(document).trigger('init.scrolling-tabs');
|
||||
|
||||
$('form.filter-form').on('submit', function (event) {
|
||||
const link = document.createElement('a');
|
||||
link.href = this.action;
|
||||
|
|
Loading…
Reference in a new issue