Commit 2ef5f23a authored by Frédéric Caplette's avatar Frédéric Caplette

Merge branch...

Merge branch '353727-make-spinners-in-app-assets-javascripts-filtered_search-filtered_search_dropdown-js-pajamas' into 'master'

Fix loading spinner for legacy Filtered search dropdown

See merge request gitlab-org/gitlab!81953
parents 3c489e08 ebf450da
import { loadingIconForLegacyJS } from '~/loading_icon_for_legacy_js';
import { FILTER_TYPE } from './constants'; import { FILTER_TYPE } from './constants';
import DropdownUtils from './dropdown_utils'; import DropdownUtils from './dropdown_utils';
import FilteredSearchDropdownManager from './filtered_search_dropdown_manager'; import FilteredSearchDropdownManager from './filtered_search_dropdown_manager';
...@@ -13,7 +14,7 @@ export default class FilteredSearchDropdown { ...@@ -13,7 +14,7 @@ export default class FilteredSearchDropdown {
this.filter = filter; this.filter = filter;
this.dropdown = dropdown; this.dropdown = dropdown;
this.loadingTemplate = `<div class="filter-dropdown-loading"> this.loadingTemplate = `<div class="filter-dropdown-loading">
<span class="spinner"></span> ${loadingIconForLegacyJS().outerHTML}
</div>`; </div>`;
this.bindEvents(); this.bindEvents();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment