Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

merge-requests/1726/head
Cristina Chumillas 2022-01-26 12:54:11 +01:00
parent 96cfccf8f3
commit 02f32df865
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/modules/ckeditor5/js/ckeditor5.es6.js
View File

@ -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;
},

9
core/modules/ckeditor5/js/ckeditor5.js
View File

@ -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;
}
};