Commit f79d23fc authored by PaytonBurdette's avatar PaytonBurdette

Migrate gfm loading spinner

Migrate gfm  loading spinner to be
pajamas compliant.

Changelog: changed
parent f1ec7d36
...@@ -3,6 +3,7 @@ import '~/lib/utils/jquery_at_who'; ...@@ -3,6 +3,7 @@ import '~/lib/utils/jquery_at_who';
import { escape as lodashEscape, sortBy, template, escapeRegExp } from 'lodash'; import { escape as lodashEscape, sortBy, template, escapeRegExp } from 'lodash';
import * as Emoji from '~/emoji'; import * as Emoji from '~/emoji';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
import { loadingIconForLegacyJS } from '~/loading_icon_for_legacy_js';
import { s__, __, sprintf } from '~/locale'; import { s__, __, sprintf } from '~/locale';
import { isUserBusy } from '~/set_status_modal/utils'; import { isUserBusy } from '~/set_status_modal/utils';
import SidebarMediator from '~/sidebar/sidebar_mediator'; import SidebarMediator from '~/sidebar/sidebar_mediator';
...@@ -957,9 +958,14 @@ GfmAutoComplete.Contacts = { ...@@ -957,9 +958,14 @@ GfmAutoComplete.Contacts = {
return `<li><small>${firstName} ${lastName}</small> ${escape(email)}</li>`; return `<li><small>${firstName} ${lastName}</small> ${escape(email)}</li>`;
}, },
}; };
const loadingSpinner = loadingIconForLegacyJS({
inline: true,
classes: ['gl-mr-2', 'gl-vertical-align-text-bottom'],
}).outerHTML;
GfmAutoComplete.Loading = { GfmAutoComplete.Loading = {
template: template: `<li style="pointer-events: none;">${loadingSpinner}Loading...</li>`,
'<li style="pointer-events: none;"><span class="spinner align-text-bottom mr-1"></span>Loading...</li>',
}; };
export default GfmAutoComplete; export default GfmAutoComplete;
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