diff --git a/core/modules/ckeditor5/js/ckeditor5.es6.js b/core/modules/ckeditor5/js/ckeditor5.es6.js index 6716e8d2c02add7f4eca112ec0fe88d9df31ca8e..36788b71a296c4dd46c566733c0dd8add50fb0d7 100644 --- a/core/modules/ckeditor5/js/ckeditor5.es6.js +++ b/core/modules/ckeditor5/js/ckeditor5.es6.js @@ -505,30 +505,18 @@ window.matchMedia('(min-width: 600px)').matches; dialogSettings.width = 'auto'; - const $content = $( - `<div class="ckeditor5-dialog-loading"><span style="top: -40px;" class="ckeditor5-dialog-loading-link">${Drupal.t( - 'Loading...', - )}</span></div>`, - ); - $content.appendTo($('body')); - const ckeditorAjaxDialog = Drupal.ajax({ dialog: dialogSettings, dialogType: 'modal', selector: '.ckeditor5-dialog-loading-link', url, - progress: { type: 'throbber' }, + progress: { type: 'fullscreen' }, submit: { editor_object: {}, }, }); ckeditorAjaxDialog.execute(); - // After a short delay, show "Loading…" message. - window.setTimeout(() => { - $content.find('span').animate({ top: '0px' }); - }, 1000); - // Store the save callback to be executed when this dialog is closed. Drupal.ckeditor5.saveCallback = saveCallback; }, diff --git a/core/modules/ckeditor5/js/ckeditor5.js b/core/modules/ckeditor5/js/ckeditor5.js index 7c0c24937eeb5deeef0759ab29cc4518a28ee9f5..d154b257685ed69657392b2cdf8c8810911df382 100644 --- a/core/modules/ckeditor5/js/ckeditor5.js +++ b/core/modules/ckeditor5/js/ckeditor5.js @@ -278,26 +278,19 @@ dialogSettings.dialogClass = classes.join(' '); dialogSettings.autoResize = window.matchMedia('(min-width: 600px)').matches; dialogSettings.width = 'auto'; - const $content = $(`<div class="ckeditor5-dialog-loading"><span style="top: -40px;" class="ckeditor5-dialog-loading-link">${Drupal.t('Loading...')}</span></div>`); - $content.appendTo($('body')); const ckeditorAjaxDialog = Drupal.ajax({ dialog: dialogSettings, dialogType: 'modal', selector: '.ckeditor5-dialog-loading-link', url, progress: { - type: 'throbber' + type: 'fullscreen' }, submit: { editor_object: {} } }); ckeditorAjaxDialog.execute(); - window.setTimeout(() => { - $content.find('span').animate({ - top: '0px' - }); - }, 1000); Drupal.ckeditor5.saveCallback = saveCallback; }