Skip to content

G
gitlab-ce
Commit 4ffbed29 authored by Olena Horal-Koretska's avatar Olena Horal-Koretska
Browse files
Options

Merge branch 'jnnkl-remove-eventlistener-main-js' into 'master' 

Remove obsolete DOMContentLoadedEventListener

See merge request gitlab-org/gitlab!66823
parents 55d8a43c 78af339a
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 116 deletions
app/assets/javascripts/main.js
View file @ 4ffbed29
...@@ -131,138 +131,136 @@ function deferredInitialisation() { ...@@ -131,138 +131,136 @@ function deferredInitialisation() {
setTimeout(() => $body.addClass('page-initialised'), 1000); setTimeout(() => $body.addClass('page-initialised'), 1000);
} }
document.addEventListener('DOMContentLoaded', () => { const $body = $('body');
const $body = $('body'); const $document = $(document);
const $document = $(document); const bootstrapBreakpoint = bp.getBreakpointSize();
const bootstrapBreakpoint = bp.getBreakpointSize();
initUserTracking();
initUserTracking(); initLayoutNav();
initLayoutNav(); initAlertHandler();
initAlertHandler();
// Set the default path for all cookies to GitLab's root directory
// Set the default path for all cookies to GitLab's root directory Cookies.defaults.path = gon.relative_url_root || '/';
Cookies.defaults.path = gon.relative_url_root || '/';
// `hashchange` is not triggered when link target is already in window.location
// `hashchange` is not triggered when link target is already in window.location $body.on('click', 'a[href^="#"]', function clickHashLinkCallback() {
$body.on('click', 'a[href^="#"]', function clickHashLinkCallback() { const href = this.getAttribute('href');
const href = this.getAttribute('href'); if (href.substr(1) === getLocationHash()) {
if (href.substr(1) === getLocationHash()) { setTimeout(handleLocationHash, 1);
setTimeout(handleLocationHash, 1); }
} });
});
/** /**
* TODO: Apparently we are collapsing the right sidebar on certain screensizes per default * TODO: Apparently we are collapsing the right sidebar on certain screensizes per default
* except on issue board pages. Why can't we do it with CSS? * except on issue board pages. Why can't we do it with CSS?
* *
* Proposal: Expose a global sidebar API, which we could import wherever we are manipulating * Proposal: Expose a global sidebar API, which we could import wherever we are manipulating
* the visibility of the sidebar. * the visibility of the sidebar.
* *
* Quick fix: Get rid of jQuery for this implementation * Quick fix: Get rid of jQuery for this implementation
*/ */
const isBoardsPage = /(projects|groups):boards:show/.test(document.body.dataset.page); const isBoardsPage = /(projects|groups):boards:show/.test(document.body.dataset.page);
if (!isBoardsPage && (bootstrapBreakpoint === 'sm' || bootstrapBreakpoint === 'xs')) { if (!isBoardsPage && (bootstrapBreakpoint === 'sm' || bootstrapBreakpoint === 'xs')) {
const $rightSidebar = $('aside.right-sidebar'); const $rightSidebar = $('aside.right-sidebar');
const $layoutPage = $('.layout-page'); const $layoutPage = $('.layout-page');
if ($rightSidebar.length > 0) { if ($rightSidebar.length > 0) {
$rightSidebar.removeClass('right-sidebar-expanded').addClass('right-sidebar-collapsed'); $rightSidebar.removeClass('right-sidebar-expanded').addClass('right-sidebar-collapsed');
$layoutPage.removeClass('right-sidebar-expanded').addClass('right-sidebar-collapsed'); $layoutPage.removeClass('right-sidebar-expanded').addClass('right-sidebar-collapsed');
} else { } else {
$layoutPage.removeClass('right-sidebar-expanded right-sidebar-collapsed'); $layoutPage.removeClass('right-sidebar-expanded right-sidebar-collapsed');
}
} }
}
// prevent default action for disabled buttons // prevent default action for disabled buttons
$('.btn').click(function clickDisabledButtonCallback(e) { $('.btn').click(function clickDisabledButtonCallback(e) {
if ($(this).hasClass('disabled')) { if ($(this).hasClass('disabled')) {
e.preventDefault(); e.preventDefault();
e.stopImmediatePropagation(); e.stopImmediatePropagation();
return false; return false;
} }
return true; return true;
}); });
localTimeAgo(document.querySelectorAll('abbr.timeago, .js-timeago'), true); localTimeAgo(document.querySelectorAll('abbr.timeago, .js-timeago'), true);
/** /**
* This disables form buttons while a form is submitting * This disables form buttons while a form is submitting
* We do not difinitively know all of the places where this is used * We do not difinitively know all of the places where this is used
* *
* TODO: Defer execution, migrate to behaviors, and add sentry logging * TODO: Defer execution, migrate to behaviors, and add sentry logging
*/ */
$body.on('ajax:complete, ajax:beforeSend, submit', 'form', function ajaxCompleteCallback(e) { $body.on('ajax:complete, ajax:beforeSend, submit', 'form', function ajaxCompleteCallback(e) {
const $buttons = $('[type="submit"], .js-disable-on-submit', this).not('.js-no-auto-disable'); const $buttons = $('[type="submit"], .js-disable-on-submit', this).not('.js-no-auto-disable');
switch (e.type) { switch (e.type) {
case 'ajax:beforeSend': case 'ajax:beforeSend':
case 'submit': case 'submit':
return $buttons.disable(); return $buttons.disable();
default: default:
return $buttons.enable(); return $buttons.enable();
} }
}); });
$('.navbar-toggler').on('click', () => { $('.navbar-toggler').on('click', () => {
// The order is important. The `menu-expanded` is used as a source of truth for now. // The order is important. The `menu-expanded` is used as a source of truth for now.
// This can be simplified when the :combined_menu feature flag is removed. // This can be simplified when the :combined_menu feature flag is removed.
// https://gitlab.com/gitlab-org/gitlab/-/issues/333180 // https://gitlab.com/gitlab-org/gitlab/-/issues/333180
$('.header-content').toggleClass('menu-expanded'); $('.header-content').toggleClass('menu-expanded');
navEventHub.$emit(EVENT_RESPONSIVE_TOGGLE); navEventHub.$emit(EVENT_RESPONSIVE_TOGGLE);
}); });
/** /**
* Show suppressed commit diff * Show suppressed commit diff
* *
* TODO: Move to commit diff pages * TODO: Move to commit diff pages
*/ */
$document.on('click', '.diff-content .js-show-suppressed-diff', function showDiffCallback() { $document.on('click', '.diff-content .js-show-suppressed-diff', function showDiffCallback() {
const $container = $(this).parent(); const $container = $(this).parent();
$container.next('table').show(); $container.next('table').show();
$container.remove(); $container.remove();
}); });
// Show/hide comments on diff // Show/hide comments on diff
$body.on('click', '.js-toggle-diff-comments', function toggleDiffCommentsCallback(e) { $body.on('click', '.js-toggle-diff-comments', function toggleDiffCommentsCallback(e) {
const $this = $(this); const $this = $(this);
const notesHolders = $this.closest('.diff-file').find('.notes_holder'); const notesHolders = $this.closest('.diff-file').find('.notes_holder');
e.preventDefault(); e.preventDefault();
$this.toggleClass('selected'); $this.toggleClass('selected');
if ($this.hasClass('active')) { if ($this.hasClass('active')) {
notesHolders.show().find('.hide, .content').show(); notesHolders.show().find('.hide, .content').show();
} else { } else {
notesHolders.hide().find('.content').hide(); notesHolders.hide().find('.content').hide();
} }
$(document).trigger('toggle.comments'); $(document).trigger('toggle.comments');
}); });
$('form.filter-form').on('submit', function filterFormSubmitCallback(event) { $('form.filter-form').on('submit', function filterFormSubmitCallback(event) {
const link = document.createElement('a'); const link = document.createElement('a');
link.href = this.action; link.href = this.action;
const action = `${this.action}${link.search === '' ? '?' : '&'}`; const action = `${this.action}${link.search === '' ? '?' : '&'}`;
event.preventDefault(); event.preventDefault();
// eslint-disable-next-line no-jquery/no-serialize // eslint-disable-next-line no-jquery/no-serialize
visitUrl(`${action}${$(this).serialize()}`); visitUrl(`${action}${$(this).serialize()}`);
}); });
const flashContainer = document.querySelector('.flash-container'); const flashContainer = document.querySelector('.flash-container');
if (flashContainer && flashContainer.children.length) { if (flashContainer && flashContainer.children.length) {
flashContainer flashContainer
.querySelectorAll('.flash-alert, .flash-notice, .flash-success') .querySelectorAll('.flash-alert, .flash-notice, .flash-success')
.forEach((flashEl) => { .forEach((flashEl) => {
removeFlashClickListener(flashEl); removeFlashClickListener(flashEl);
}); });
} }
// initialize field errors // initialize field errors
$('.gl-show-field-errors').each((i, form) => new GlFieldErrors(form)); $('.gl-show-field-errors').each((i, form) => new GlFieldErrors(form));
requestIdleCallback(deferredInitialisation); requestIdleCallback(deferredInitialisation);
});
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7