Unverified Commit 77535b7a authored by Lauri Timmanee's avatar Lauri Timmanee
Browse files

Issue #3248448 by hooroomoo, lauriii, Wim Leers: Dialog loading text is unstyled

parent 6d95c625

core/modules/ckeditor5/js/ckeditor5.es6.js

+1 −13
Original line number Diff line number Diff line
@@ -644,30 +644,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;

    },

core/modules/ckeditor5/js/ckeditor5.js

+1 −8
Original line number Diff line number Diff line
@@ -337,26 +337,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;

    }

  };