Skip to content

Commit

Permalink
Merge pull request backdrop#1037 from quicksketch/1125/image_layout
Browse files Browse the repository at this point in the history
Issue backdrop#1125: Editor dialogs conflict with Layout dialogs.
  • Loading branch information
quicksketch committed Sep 10, 2015
2 parents f6bef04 + 677fea7 commit c2939d1
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions core/modules/ckeditor5/core/modules/ckeditor/js/ckeditor.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
Backdrop.editors.ckeditor = {

attach: function (element, format) {
if (!$('#ckeditor-modal').length) {
$('<div id="ckeditor-modal" />').hide().appendTo('body');
}

this._loadExternalPlugins(format);
// Set a title on the CKEditor instance that includes the text field's
// label so that screen readers say something that is understandable
Expand Down Expand Up @@ -118,6 +122,8 @@
classes.push('editor-dialog');
dialogSettings.dialogClass = classes.join(' ');
dialogSettings.autoResize = true;
dialogSettings.modal = true;
dialogSettings.target = '#ckeditor-modal';

// Add a "Loading…" message, hide it underneath the CKEditor toolbar, create
// a Backdrop.ajax instance to load the dialog and trigger it.
Expand Down

0 comments on commit c2939d1

Please sign in to comment.