diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
commit | 9dc93a4519d9d5d7be48ff274127136236a3adb3 (patch) | |
tree | 70467ae3692a0e35e5ea56bcb803eb512a10bedb /app/assets/javascripts/main.js | |
parent | 4b0f34b6d759d6299322b3a54453e930c6121ff0 (diff) |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43
Diffstat (limited to 'app/assets/javascripts/main.js')
-rw-r--r-- | app/assets/javascripts/main.js | 55 |
1 files changed, 2 insertions, 53 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 417baddc031..3f22bd36a4a 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -16,21 +16,16 @@ import { initRails } from '~/lib/utils/rails_ujs'; import * as popovers from '~/popovers'; import * as tooltips from '~/tooltips'; import initAlertHandler from './alert_handler'; -import { deprecatedCreateFlash as Flash, removeFlashClickListener } from './flash'; +import { removeFlashClickListener } from './flash'; import initTodoToggle from './header'; import initLayoutNav from './layout_nav'; -import { - handleLocationHash, - addSelectOnFocusBehaviour, - getCspNonceValue, -} from './lib/utils/common_utils'; +import { handleLocationHash, addSelectOnFocusBehaviour } from './lib/utils/common_utils'; import { localTimeAgo } from './lib/utils/datetime_utility'; import { getLocationHash, visitUrl } from './lib/utils/url_utility'; // everything else import initFeatureHighlight from './feature_highlight'; import LazyLoader from './lazy_loader'; -import { __ } from './locale'; import initLogoAnimation from './logo'; import initFrequentItemDropdowns from './frequent_items'; import initBreadcrumbs from './breadcrumb'; @@ -49,29 +44,8 @@ applyGitLabUIConfig(); window.jQuery = jQuery; window.$ = jQuery; -// Add nonce to jQuery script handler -jQuery.ajaxSetup({ - converters: { - // eslint-disable-next-line @gitlab/require-i18n-strings, func-names - 'text script': function (text) { - jQuery.globalEval(text, { nonce: getCspNonceValue() }); - return text; - }, - }, -}); - -function disableJQueryAnimations() { - $.fx.off = true; -} - -// Disable jQuery animations -if (gon?.disable_animations) { - disableJQueryAnimations(); -} - // inject test utilities if necessary if (process.env.NODE_ENV !== 'production' && gon?.test_env) { - disableJQueryAnimations(); import(/* webpackMode: "eager" */ './test_utils/'); } @@ -135,20 +109,6 @@ function deferredInitialisation() { addSelectOnFocusBehaviour('.js-select-on-focus'); - $('.remove-row').on('ajax:success', function removeRowAjaxSuccessCallback() { - tooltips.dispose(this); - - $(this).closest('li').addClass('gl-display-none!'); - }); - - $('.js-remove-tr').on('ajax:before', function removeTRAjaxBeforeCallback() { - $(this).hide(); - }); - - $('.js-remove-tr').on('ajax:success', function removeTRAjaxSuccessCallback() { - $(this).closest('tr').addClass('gl-display-none!'); - }); - const glTooltipDelay = localStorage.getItem('gl-tooltip-delay'); const delay = glTooltipDelay ? JSON.parse(glTooltipDelay) : 0; @@ -239,17 +199,6 @@ document.addEventListener('DOMContentLoaded', () => { } }); - // eslint-disable-next-line no-jquery/no-ajax-events - $(document).ajaxError((e, xhrObj) => { - const ref = xhrObj.status; - - if (ref === 401) { - Flash(__('You need to be logged in.')); - } else if (ref === 404 || ref === 500) { - Flash(__('Something went wrong on our end.')); - } - }); - $('.navbar-toggler').on('click', () => { $('.header-content').toggleClass('menu-expanded'); }); |