Commit 1c1860b2 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch 'rk4bir-master-patch-60164' into 'master'

Resolve "Migrate '.fa-spinner' to '.spinner' for 'app/assets/javascripts/notes.js'"

Closes #202282

See merge request gitlab-org/gitlab!24916
parents f6616247 f8f25b3a
...@@ -1808,11 +1808,7 @@ export default class Notes { ...@@ -1808,11 +1808,7 @@ export default class Notes {
$editingNote.removeClass('is-editing fade-in-full').addClass('being-posted fade-in-half'); $editingNote.removeClass('is-editing fade-in-full').addClass('being-posted fade-in-half');
$editingNote $editingNote
.find('.note-headline-meta a') .find('.note-headline-meta a')
.html( .html('<span class="spinner align-text-bottom"></span>');
`<i class="fa fa-spinner fa-spin" aria-label="${__(
'Comment is being updated',
)}" aria-hidden="true"></i>`,
);
// Make request to update comment on server // Make request to update comment on server
axios axios
...@@ -1825,7 +1821,7 @@ export default class Notes { ...@@ -1825,7 +1821,7 @@ export default class Notes {
// Submission failed, revert back to original note // Submission failed, revert back to original note
$noteBodyText.html(escape(cachedNoteBodyText)); $noteBodyText.html(escape(cachedNoteBodyText));
$editingNote.removeClass('being-posted fade-in'); $editingNote.removeClass('being-posted fade-in');
$editingNote.find('.fa.fa-spinner').remove(); $editingNote.find('.spinner').remove();
// Show Flash message about failure // Show Flash message about failure
this.updateNoteError(); this.updateNoteError();
......
---
title: Migrated from .fa-spinner to .spinner in 'app/assets/javascripts/notes.js
merge_request: 24916
author: Raihan Kabir (gitlab/rk4bir)
type: changed
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