diff options
| -rw-r--r-- | app/assets/javascripts/commons/gl_dropdown.js (renamed from app/assets/javascripts/gl_dropdown.js) | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/commons/jquery.js | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/main.js | 1 | ||||
| -rw-r--r-- | spec/javascripts/gl_dropdown_spec.js | 2 | ||||
| -rw-r--r-- | spec/javascripts/labels_issue_sidebar_spec.js | 2 | ||||
| -rw-r--r-- | spec/javascripts/search_autocomplete_spec.js | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/gl_dropdown.js b/app/assets/javascripts/commons/gl_dropdown.js index 64f258aed64..debe8f0b4d3 100644 --- a/app/assets/javascripts/gl_dropdown.js +++ b/app/assets/javascripts/commons/gl_dropdown.js @@ -2,8 +2,8 @@ /* global fuzzaldrinPlus */ import _ from 'underscore'; import fuzzaldrinPlus from 'fuzzaldrin-plus'; -import { visitUrl } from './lib/utils/url_utility'; -import { isObject } from './lib/utils/type_utility'; +import { visitUrl } from '../lib/utils/url_utility'; +import { isObject } from '../lib/utils/type_utility'; var GitLabDropdown, GitLabDropdownFilter, GitLabDropdownRemote, GitLabDropdownInput; diff --git a/app/assets/javascripts/commons/jquery.js b/app/assets/javascripts/commons/jquery.js index b93e94a3c97..406266c0442 100644 --- a/app/assets/javascripts/commons/jquery.js +++ b/app/assets/javascripts/commons/jquery.js @@ -8,3 +8,4 @@ import 'vendor/jquery.atwho'; import 'vendor/jquery.scrollTo'; import 'vendor/jquery.waitforimages'; import 'select2/select2'; +import './gl_dropdown'; diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 59bfa482bb0..e6ae6feec01 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -38,7 +38,6 @@ import loadAwardsHandler from './awards_handler'; import bp from './breakpoints'; import './confirm_danger_modal'; import Flash, { removeFlashClickListener } from './flash'; -import './gl_dropdown'; import initTodoToggle from './header'; import initImporterStatus from './importer_status'; import initLayoutNav from './layout_nav'; diff --git a/spec/javascripts/gl_dropdown_spec.js b/spec/javascripts/gl_dropdown_spec.js index b13d1bf8dff..7a7b7ec158e 100644 --- a/spec/javascripts/gl_dropdown_spec.js +++ b/spec/javascripts/gl_dropdown_spec.js @@ -1,6 +1,6 @@ /* eslint-disable comma-dangle, no-param-reassign, no-unused-expressions, max-len */ -import '~/gl_dropdown'; +import '~/commons/gl_dropdown'; import '~/lib/utils/common_utils'; import * as urlUtils from '~/lib/utils/url_utility'; diff --git a/spec/javascripts/labels_issue_sidebar_spec.js b/spec/javascripts/labels_issue_sidebar_spec.js index a197b35f6fb..10a42d59a2c 100644 --- a/spec/javascripts/labels_issue_sidebar_spec.js +++ b/spec/javascripts/labels_issue_sidebar_spec.js @@ -2,7 +2,7 @@ import IssuableContext from '~/issuable_context'; import LabelsSelect from '~/labels_select'; -import '~/gl_dropdown'; +import '~/commons/gl_dropdown'; import 'select2'; import '~/api'; import '~/create_label'; diff --git a/spec/javascripts/search_autocomplete_spec.js b/spec/javascripts/search_autocomplete_spec.js index 206f95abc1a..9ec76dfc0eb 100644 --- a/spec/javascripts/search_autocomplete_spec.js +++ b/spec/javascripts/search_autocomplete_spec.js @@ -1,6 +1,6 @@ /* eslint-disable space-before-function-paren, max-len, no-var, one-var, one-var-declaration-per-line, no-unused-expressions, consistent-return, no-param-reassign, default-case, no-return-assign, comma-dangle, object-shorthand, prefer-template, quotes, new-parens, vars-on-top, new-cap, max-len */ -import '~/gl_dropdown'; +import '~/commons/gl_dropdown'; import SearchAutocomplete from '~/search_autocomplete'; import '~/lib/utils/common_utils'; import * as urlUtils from '~/lib/utils/url_utility'; |