diff --git a/core/misc/ajax.es6.js b/core/misc/ajax.es6.js index a7c30f9585..c15f313465 100644 --- a/core/misc/ajax.es6.js +++ b/core/misc/ajax.es6.js @@ -527,6 +527,7 @@ else { ajax.options.url += '&'; } + // If this element has a dialog type use if for the wrapper if not use 'ajax' let wrapper = `drupal_${(element_settings.dialogType || 'ajax')}`; if (element_settings.drupalDialogRenderer) { wrapper += `.${element_settings.drupalDialogRenderer}`; diff --git a/core/misc/ajax.js b/core/misc/ajax.js index cdfbcbf694..022da3abb3 100644 --- a/core/misc/ajax.js +++ b/core/misc/ajax.js @@ -245,6 +245,7 @@ } else { ajax.options.url += '&'; } + var wrapper = 'drupal_' + (element_settings.dialogType || 'ajax'); if (element_settings.drupalDialogRenderer) { wrapper += '.' + element_settings.drupalDialogRenderer; diff --git a/core/modules/outside_in/js/outside_in.es6.js b/core/modules/outside_in/js/outside_in.es6.js index 171821ec04..1f1bca13dd 100644 --- a/core/modules/outside_in/js/outside_in.es6.js +++ b/core/modules/outside_in/js/outside_in.es6.js @@ -216,11 +216,10 @@ Drupal.ajax.instances .filter(function (instance) { var hasElement = instance && !!instance.element; - var rendererOffCanvas = false; if (hasElement) { - rendererOffCanvas = $(instance.element).attr('data-dialog-renderer') === 'off_canvas'; + // If there is an element and the renderer is 'off_canvas' then we want to add our changes. + return $(instance.element).attr('data-dialog-renderer') === 'off_canvas'; } - return hasElement && rendererOffCanvas; }) .forEach(function (instance) { // Check to make sure existing dialogOptions aren't overridden. diff --git a/core/modules/outside_in/js/outside_in.js b/core/modules/outside_in/js/outside_in.js index d2a16f681e..d5edaade0e 100644 --- a/core/modules/outside_in/js/outside_in.js +++ b/core/modules/outside_in/js/outside_in.js @@ -130,11 +130,9 @@ Drupal.ajax.instances.filter(function (instance) { var hasElement = instance && !!instance.element; - var rendererOffCanvas = false; if (hasElement) { - rendererOffCanvas = $(instance.element).attr('data-dialog-renderer') === 'off_canvas'; + return $(instance.element).attr('data-dialog-renderer') === 'off_canvas'; } - return hasElement && rendererOffCanvas; }).forEach(function (instance) { if (!('dialogOptions' in instance.options.data)) { instance.options.data.dialogOptions = {};