From 2aa29872a631b6becf7521ae95d6b548d3d3962f Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Thu, 13 Sep 2018 17:05:10 -0500 Subject: Move performance_bar setup to dispatcher to main.js --- app/assets/javascripts/dispatcher.js | 8 -------- app/assets/javascripts/main.js | 2 ++ 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'app') diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 1186e9e4d95..5ae98d69474 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -4,7 +4,6 @@ import $ from 'jquery'; import GfmAutoComplete from './gfm_auto_complete'; import { convertPermissionToBoolean } from './lib/utils/common_utils'; import Shortcuts from './shortcuts'; -import performanceBar from './performance_bar'; function initPageShortcuts(page) { const pagesWithCustomShortcuts = [ @@ -55,17 +54,10 @@ function initGFMInput() { }); } -function initPerformanceBar() { - if (document.querySelector('#js-peek')) { - performanceBar({ container: '#js-peek' }); - } -} - export default () => { const page = $('body').attr('data-page'); if (page) { initPageShortcuts(page); initGFMInput(); - initPerformanceBar(); } }; diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index a7179686aef..96e56a1e12e 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -28,6 +28,7 @@ import './frequent_items'; import initBreadcrumbs from './breadcrumb'; import initDispatcher from './dispatcher'; import initUsagePingConsent from './usage_ping_consent'; +import initPerformanceBar from './performance_bar'; import initSearchAutocomplete from './search_autocomplete'; import GlFieldErrors from './gl_field_errors'; @@ -80,6 +81,7 @@ document.addEventListener('DOMContentLoaded', () => { initUsagePingConsent(); if (document.querySelector('.search')) initSearchAutocomplete(); + if (document.querySelector('#js-peek')) initPerformanceBar({ container: '#js-peek' }); // Set the default path for all cookies to GitLab's root directory Cookies.defaults.path = gon.relative_url_root || '/'; -- cgit v1.2.1