Handle loading message with spinner

This commit is contained in:
yflory 2025-10-02 17:44:38 +02:00
parent 79ad917a2a
commit fd3b84e369
3 changed files with 9 additions and 7 deletions

View File

@ -22,6 +22,7 @@ define([
<div class="cp-loading-progress-list"></div>
<div class="cp-loading-progress-container"></div>
</div>
<div id="cp-loading-spinner-message"></div>
<div class="cp-loading-spinner-container">
<div class="cp-spinner-main"></div>
</div>

View File

@ -102,6 +102,10 @@
@media screen and (max-height: 600px) {
font-size: 16px !important;
}
#cp-loading-spinner-message {
color: @cp_loading-color;
}
#cp-loading-message {
background: @cp_loading-msg-bg;
padding: 1rem;

View File

@ -1083,11 +1083,11 @@ define([
}
// Add loading text
const $message = $('#' + LOADING).find('#cp-loading-message');
const $spinnerMessage = $('#' + LOADING).find('#cp-loading-spinner-message').hide();
$message.removeClass('cp-error-message cp-error-message-alt');
$message.hide().text('');
if (loadingText) {
$message.show().text(loadingText);
} else {
$message.hide().text('');
$spinnerMessage.show().text(loadingText);
}
};
if ($('#' + LOADING).length) {
@ -1133,9 +1133,7 @@ define([
}
var $loading = $('#' + LOADING);
if (!$loading.is(':visible') || $loading.hasClass('cp-loading-hidden')) {
UI.addLoadingScreen();
}
UI.addLoadingScreen();
// Remove the progress list
$loading.find('.cp-loading-progress').remove();
// Hide the spinner
@ -1145,7 +1143,6 @@ define([
// Add the error message
var $error = $loading.find('#cp-loading-message').show();
$error.removeClass('cp-error-message cp-error-message-alt');
if (error instanceof Element) {
$error.html('').append(error);
} else {