diff --git a/app/assets/javascripts/gl_dropdown.js b/app/assets/javascripts/commons/gl_dropdown.js similarity index 99% rename from app/assets/javascripts/gl_dropdown.js rename to app/assets/javascripts/commons/gl_dropdown.js index e38ae286ac61b171e4a7707e72d14954bcc29702..43683541eec4f58707ce3de1895e7f4f312d631d 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 358935d8488df00c6a8db02f60a2a1969bbdff5c..98023d2de223323b4aa15c8377c57198d04d6ab2 100644 --- a/app/assets/javascripts/commons/jquery.js +++ b/app/assets/javascripts/commons/jquery.js @@ -11,3 +11,4 @@ import 'select2/select2'; // EE-only import 'vendor/jquery.tablesorter'; +import './gl_dropdown'; diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 7a6bbb5c24928a7234bd0fb2fecc360fd93589e7..ea21cace2828655f6741d73d37f93fc54e1b028d 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -22,7 +22,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 b13d1bf8dffec8139db7ca5169e06531a2e677f3..7a7b7ec158efbe57df920833b7fba1af1fe83ca1 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 a197b35f6fb807e9b84cb71c2049a6a64f45d3d2..10a42d59a2c9304383e3bf5bea9ae37020dd2be6 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 206f95abc1a4d350d365df0a4d42cfc09466f15c..9ec76dfc0ebac05a8ee727687c422098d8d1788f 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';