From 02f32df86529ccae0d844075977cc736b9393091 Mon Sep 17 00:00:00 2001
From: Cristina Chumillas <ckrina@1206650.no-reply.drupal.org>
Date: Wed, 26 Jan 2022 12:54:11 +0100
Subject: [PATCH] Issue #3248448 by hooroomoo, lauriii, Wim Leers: Dialog
 loading text is unstyled

---
 core/modules/ckeditor5/js/ckeditor5.es6.js | 14 +-------------
 core/modules/ckeditor5/js/ckeditor5.js     |  9 +--------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/core/modules/ckeditor5/js/ckeditor5.es6.js b/core/modules/ckeditor5/js/ckeditor5.es6.js
index 6716e8d2c02..36788b71a29 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 6e7a876e7a9..8e10ab7121a 100644
--- a/core/modules/ckeditor5/js/ckeditor5.js
+++ b/core/modules/ckeditor5/js/ckeditor5.js
@@ -305,26 +305,19 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
       dialogSettings.dialogClass = classes.join(' ');
       dialogSettings.autoResize = window.matchMedia('(min-width: 600px)').matches;
       dialogSettings.width = 'auto';
-      var $content = $("<div class=\"ckeditor5-dialog-loading\"><span style=\"top: -40px;\" class=\"ckeditor5-dialog-loading-link\">".concat(Drupal.t('Loading...'), "</span></div>"));
-      $content.appendTo($('body'));
       var ckeditorAjaxDialog = Drupal.ajax({
         dialog: dialogSettings,
         dialogType: 'modal',
         selector: '.ckeditor5-dialog-loading-link',
         url: url,
         progress: {
-          type: 'throbber'
+          type: 'fullscreen'
         },
         submit: {
           editor_object: {}
         }
       });
       ckeditorAjaxDialog.execute();
-      window.setTimeout(function () {
-        $content.find('span').animate({
-          top: '0px'
-        });
-      }, 1000);
       Drupal.ckeditor5.saveCallback = saveCallback;
     }
   };