Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-09-14 00:01:12 +0300
committerMike Greiling <mike@pixelcog.com>2018-09-14 07:59:17 +0300
commitc7afb8f8853ba4f88182751ac776825e6a000a03 (patch)
tree4462d6ba904ff140b1d3da1dce7f8ecee64b178e /app/assets
parent105ab36b68b16422d57f16c84b4dd2ea2eabe17a (diff)
Move initFieldErrors from dispatcher to main.js
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/dispatcher.js8
-rw-r--r--app/assets/javascripts/main.js4
2 files changed, 4 insertions, 8 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js
index a5af37e80b6..192d8ca60fe 100644
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -3,7 +3,6 @@
import $ from 'jquery';
import GfmAutoComplete from './gfm_auto_complete';
import { convertPermissionToBoolean } from './lib/utils/common_utils';
-import GlFieldErrors from './gl_field_errors';
import Shortcuts from './shortcuts';
import SearchAutocomplete from './search_autocomplete';
import performanceBar from './performance_bar';
@@ -15,12 +14,6 @@ function initSearch() {
}
}
-function initFieldErrors() {
- $('.gl-show-field-errors').each((i, form) => {
- new GlFieldErrors(form);
- });
-}
-
function initPageShortcuts(page) {
const pagesWithCustomShortcuts = [
'projects:activity',
@@ -78,7 +71,6 @@ function initPerformanceBar() {
export default () => {
initSearch();
- initFieldErrors();
const page = $('body').attr('data-page');
if (page) {
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index debc585b783..393d195549f 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 GlFieldErrors from './gl_field_errors';
// expose jQuery as global (TODO: remove these)
window.jQuery = jQuery;
@@ -266,5 +267,8 @@ document.addEventListener('DOMContentLoaded', () => {
});
}
+ // initialize field errors
+ $('.gl-show-field-errors').each((i, form) => new GlFieldErrors(form));
+
initDispatcher();
});