core/modules/ckeditor/js/ckeditor.js | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/core/modules/ckeditor/js/ckeditor.js b/core/modules/ckeditor/js/ckeditor.js index f67ed62..c3e4ccc 100644 --- a/core/modules/ckeditor/js/ckeditor.js +++ b/core/modules/ckeditor/js/ckeditor.js @@ -210,6 +210,8 @@ * An object containing settings to be passed to the jQuery UI. */ openDialog: function (editor, url, existingValues, saveCallback, dialogSettings) { + var isInline = CKEDITOR.instances[editor.name].editable().isInline(); + // Locate a suitable place to display our loading indicator. var $target = $(editor.container.$); if (editor.elementMode === CKEDITOR.ELEMENT_MODE_REPLACE) { @@ -225,10 +227,13 @@ dialogSettings.dialogClass = classes.join(' '); dialogSettings.autoResize = Drupal.checkWidthBreakpoint(600); - // Add a "Loading…" message, hide it underneath the CKEditor toolbar, - // create a Drupal.Ajax instance to load the dialog and trigger it. - var $content = $('
' + Drupal.t('Loading...') + '
'); - $content.appendTo($target); + // @todo Improve in https://www.drupal.org/node/2563081. + if (!isInline) { + // Add a "Loading…" message, hide it underneath the CKEditor toolbar, + // create a Drupal.Ajax instance to load the dialog and trigger it. + var $content = $('
' + Drupal.t('Loading...') + '
'); + $content.appendTo($target); + } var ckeditorAjaxDialog = Drupal.ajax({ dialog: dialogSettings, @@ -242,10 +247,13 @@ }); ckeditorAjaxDialog.execute(); - // After a short delay, show "Loading…" message. - window.setTimeout(function () { - $content.find('span').animate({top: '0px'}); - }, 1000); + // @todo Improve in https://www.drupal.org/node/2563081. + if (!isInline) { + // After a short delay, show "Loading…" message. + window.setTimeout(function () { + $content.find('span').animate({top: '0px'}); + }, 1000); + } // Store the save callback to be executed when this dialog is closed. Drupal.ckeditor.saveCallback = saveCallback;