diff --git a/core/modules/outside_in/js/off-canvas.es6.js b/core/modules/outside_in/js/off-canvas.es6.js index 99077ec98f..a65a7c91be 100644 --- a/core/modules/outside_in/js/off-canvas.es6.js +++ b/core/modules/outside_in/js/off-canvas.es6.js @@ -51,7 +51,7 @@ * Settings related to the composition of the dialog. * @return {undefined} */ - beforeCreate(settings) { + beforeCreate(dialog, $element, settings) { $('body').addClass('js-tray-open'); settings.dialogClass += ' ui-dialog-off-canvas'; // @see http://api.jqueryui.com/position/ @@ -72,7 +72,7 @@ * Handler fired after an off-canvas dialog has been closed. * @return {undefined} */ - beforeClose() { + beforeClose(dialog, $element) { $('body').removeClass('js-tray-open'); // Remove all *.off-canvas events $(document).off('.off-canvas'); @@ -111,7 +111,7 @@ * Settings related to the composition of the dialog. * @return {undefined} */ - render(settings) { + render(dialog, $element, settings) { $('.ui-dialog-off-canvas, .ui-dialog-off-canvas .ui-dialog-titlebar').toggleClass('ui-dialog-empty-title', !settings.title); }, @@ -237,18 +237,18 @@ $(window).once('off-canvas').on({ 'dialog:beforecreate': (event, dialog, $element, settings) => { if (Drupal.offCanvas.isOffCanvas($element)) { - Drupal.offCanvas.beforeCreate(settings); + Drupal.offCanvas.beforeCreate(dialog, $element, settings); } }, 'dialog:aftercreate': (event, dialog, $element, settings) => { if (Drupal.offCanvas.isOffCanvas($element)) { - Drupal.offCanvas.render(settings); + Drupal.offCanvas.render(dialog, $element, settings); Drupal.offCanvas.afterCreate($element, settings); } }, 'dialog:beforeclose': (event, dialog, $element) => { if (Drupal.offCanvas.isOffCanvas($element)) { - Drupal.offCanvas.beforeClose(event, dialog, $element); + Drupal.offCanvas.beforeClose(dialog, $element); } }, }); diff --git a/core/modules/outside_in/js/off-canvas.js b/core/modules/outside_in/js/off-canvas.js index b9ec223d12..70164e433f 100644 --- a/core/modules/outside_in/js/off-canvas.js +++ b/core/modules/outside_in/js/off-canvas.js @@ -14,7 +14,7 @@ isOffCanvas: function isOffCanvas($element) { return $element.is('#drupal-off-canvas'); }, - beforeCreate: function beforeCreate(settings) { + beforeCreate: function beforeCreate(dialog, $element, settings) { $('body').addClass('js-tray-open'); settings.dialogClass += ' ui-dialog-off-canvas'; @@ -26,7 +26,7 @@ settings.height = $(window).height(); }, - beforeClose: function beforeClose() { + beforeClose: function beforeClose(dialog, $element) { $('body').removeClass('js-tray-open'); $(document).off('.off-canvas'); @@ -42,7 +42,7 @@ $(window).on('resize.off-canvas scroll.off-canvas', eventData, debounce(Drupal.offCanvas.resetSize, 100)).trigger('resize.off-canvas'); }, - render: function render(settings) { + render: function render(dialog, $element, settings) { $('.ui-dialog-off-canvas, .ui-dialog-off-canvas .ui-dialog-titlebar').toggleClass('ui-dialog-empty-title', !settings.title); }, handleDialogResize: function handleDialogResize(event) { @@ -112,18 +112,18 @@ $(window).once('off-canvas').on({ 'dialog:beforecreate': function dialogBeforecreate(event, dialog, $element, settings) { if (Drupal.offCanvas.isOffCanvas($element)) { - Drupal.offCanvas.beforeCreate(settings); + Drupal.offCanvas.beforeCreate(dialog, $element, settings); } }, 'dialog:aftercreate': function dialogAftercreate(event, dialog, $element, settings) { if (Drupal.offCanvas.isOffCanvas($element)) { - Drupal.offCanvas.render(settings); + Drupal.offCanvas.render(dialog, $element, settings); Drupal.offCanvas.afterCreate($element, settings); } }, 'dialog:beforeclose': function dialogBeforeclose(event, dialog, $element) { if (Drupal.offCanvas.isOffCanvas($element)) { - Drupal.offCanvas.beforeClose(event, dialog, $element); + Drupal.offCanvas.beforeClose(dialog, $element); } } });