Skip to content

Commit 653cb6b

Browse files
committed
Ensure forms within CKEditor 5 modals aren't processed for sticky actions.
1 parent a4f5be4 commit 653cb6b

File tree

4 files changed

+4
-0
lines changed

4 files changed

+4
-0
lines changed

dist/js/more_actions.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ $ = jQuery, Backdrop.behaviors.ginFormActions = {
88
init: function(context, settings) {
99
const actionsFormId = settings.Gin.actions_form_id;
1010
$("#backdrop-modal form").once("ginEditModalForm").addClass("gin-edit-modal-form"),
11+
$("#ckeditor5-modal form").once("ginEditModalForm").addClass("gin-edit-modal-form"),
1112
$("#" + actionsFormId + ":not(.gin-edit-modal-form)").once("ginEditForm").each((function() {
1213
$(".form-actions input", this).attr("form", actionsFormId), $("body > .layout > .region-sticky .block-page-title-block").append($(".form-actions", this));
1314
})), $(".gin-more-actions__trigger").once("ginMoreActionsToggle").each((function(el) {

dist/js/sidebar.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
init: function(context, settings) {
1111
const hideLabel = Backdrop.t("Hide sidebar panel"), sidebarFormId = settings.Gin.sidebar_form_id, actionsFormId = settings.Gin.actions_form_id, sidebarToggler = '<a href="#toggle-sidebar" class="meta-sidebar__trigger trigger" role="button" title="' + hideLabel + '" aria-controls="gin_sidebar"><span class="visually-hidden">' + hideLabel + "</span></a>";
1212
$("#backdrop-modal form").once("ginEditModalForm").addClass("gin-edit-modal-form"),
13+
$("#ckeditor5-modal form").once("ginEditModalForm").addClass("gin-edit-modal-form"),
1314
$("#" + sidebarFormId + ":not(.gin-edit-modal-form)").once("gin-sidebar").each((function() {
1415
$("> div:first-child", this).addClass("layout-region-node-main"), actionsFormId ? $(".region-sticky .form-actions").prepend(sidebarToggler) : $(".form-actions", this).append(sidebarToggler),
1516
$(this).append('<div id="gin_sidebar" class="layout-region-node-secondary"><span class="gin-sidebar-draggable" id="gin-sidebar-draggable"></span></div>'),

js/more_actions.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
init: function (context, settings) {
1616
const actionsFormId = settings.Gin.actions_form_id;
1717
$('#backdrop-modal form').once('ginEditModalForm').addClass('gin-edit-modal-form');
18+
$('#ckeditor5-modal form').once('ginEditModalForm').addClass('gin-edit-modal-form');
1819
$('#' + actionsFormId + ':not(.gin-edit-modal-form)').once('ginEditForm').each(function () {
1920
// Sync form ID.
2021
// Backdrop.ginStickyFormActions.updateFormId(newParent, $(this).attr('id'));

js/sidebar.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
const actionsFormId = settings.Gin.actions_form_id;
2424
const sidebarToggler = '<a href="#toggle-sidebar" class="meta-sidebar__trigger trigger" role="button" title="' + hideLabel + '" aria-controls="gin_sidebar"><span class="visually-hidden">' + hideLabel + '</span></a>';
2525
$('#backdrop-modal form').once('ginEditModalForm').addClass('gin-edit-modal-form');
26+
$("#ckeditor5-modal form").once("ginEditModalForm").addClass("gin-edit-modal-form"),
2627
$('#' + sidebarFormId + ':not(.gin-edit-modal-form)').once('gin-sidebar').each(function () {
2728
$('> div:first-child', this).addClass('layout-region-node-main');
2829

0 commit comments

Comments
 (0)