Commit 32141377 authored by Martin Wortschack's avatar Martin Wortschack

Merge branch...

Merge branch '353723-make-spinners-in-app-assets-javascripts-single_file_diff-js-pajamas-compliant' into 'master'

Update spinner in single_file_diff to be pajamas compliant

See merge request gitlab-org/gitlab!81955
parents 5dad79f9 8baef6d2
/* eslint-disable consistent-return */ /* eslint-disable consistent-return */
import $ from 'jquery'; import $ from 'jquery';
import { loadingIconForLegacyJS } from '~/loading_icon_for_legacy_js';
import { spriteIcon } from '~/lib/utils/common_utils'; import { spriteIcon } from '~/lib/utils/common_utils';
import FilesCommentButton from './files_comment_button'; import FilesCommentButton from './files_comment_button';
import createFlash from './flash'; import createFlash from './flash';
...@@ -10,7 +11,7 @@ import { __ } from './locale'; ...@@ -10,7 +11,7 @@ import { __ } from './locale';
import syntaxHighlight from './syntax_highlight'; import syntaxHighlight from './syntax_highlight';
const WRAPPER = '<div class="diff-content"></div>'; const WRAPPER = '<div class="diff-content"></div>';
const LOADING_HTML = '<span class="spinner"></span>'; const LOADING_HTML = loadingIconForLegacyJS().outerHTML;
const ERROR_HTML = `<div class="nothing-here-block">${spriteIcon( const ERROR_HTML = `<div class="nothing-here-block">${spriteIcon(
'warning-solid', 'warning-solid',
's16', 's16',
......
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