diff --git a/core/modules/settings_tray/js/settings_tray.es6.js b/core/modules/settings_tray/js/settings_tray.es6.js index a50f45198d..1780f47c01 100644 --- a/core/modules/settings_tray/js/settings_tray.es6.js +++ b/core/modules/settings_tray/js/settings_tray.es6.js @@ -5,7 +5,7 @@ * @private */ -(function ($, Drupal, drupalSettings) { +(($, Drupal, { settings_tray: settings }) => { const blockConfigureSelector = '[data-settings-tray-edit]'; const toggleEditSelector = '[data-drupal-settingstray="toggle"]'; const itemsToToggleSelector = '[data-off-canvas-main-canvas], #toolbar-bar, [data-drupal-settingstray="editable"] a, [data-drupal-settingstray="editable"] button'; @@ -165,14 +165,12 @@ instance.options.data.dialogOptions = {}; } - if (drupalSettings.hasOwnProperty('settings_tray') && drupalSettings.settings_tray.hasOwnProperty('overridden_blocks')) { - Object.keys(drupalSettings.settings_tray.overridden_blocks).forEach( - (blockId) => { - if (instance.options.url.indexOf(`/admin/structure/block/manage/${blockId}/off-canvas`) !== -1) { - instance.options.url = drupalSettings.settings_tray.overridden_blocks[blockId]; - } - }, - ); + if (settings && settings.hasOwnProperty('overridden_blocks')) { + Object.keys(settings.overridden_blocks).forEach((blockId) => { + if (instance.options.url.indexOf(`/admin/structure/block/manage/${blockId}/off-canvas`) !== -1) { + instance.options.url = settings.overridden_blocks[blockId]; + } + }); } instance.options.data.dialogOptions.settingsTrayActiveEditableId = $(instance.element).parents('.settings-tray-editable').attr('id'); @@ -264,4 +262,4 @@ } }, }); -}(jQuery, Drupal, drupalSettings)); +})(jQuery, Drupal, drupalSettings); diff --git a/core/modules/settings_tray/js/settings_tray.js b/core/modules/settings_tray/js/settings_tray.js index 9d7e80a1bf..10e702ff3f 100644 --- a/core/modules/settings_tray/js/settings_tray.js +++ b/core/modules/settings_tray/js/settings_tray.js @@ -5,7 +5,9 @@ * @preserve **/ -(function ($, Drupal, drupalSettings) { +(function ($, Drupal, _ref) { + var settings = _ref.settings_tray; + var blockConfigureSelector = '[data-settings-tray-edit]'; var toggleEditSelector = '[data-drupal-settingstray="toggle"]'; var itemsToToggleSelector = '[data-off-canvas-main-canvas], #toolbar-bar, [data-drupal-settingstray="editable"] a, [data-drupal-settingstray="editable"] button'; @@ -101,10 +103,10 @@ instance.options.data.dialogOptions = {}; } - if (drupalSettings.hasOwnProperty('settings_tray') && drupalSettings.settings_tray.hasOwnProperty('overridden_blocks')) { - Object.keys(drupalSettings.settings_tray.overridden_blocks).forEach(function (blockId) { + if (settings && settings.hasOwnProperty('overridden_blocks')) { + Object.keys(settings.overridden_blocks).forEach(function (blockId) { if (instance.options.url.indexOf('/admin/structure/block/manage/' + blockId + '/off-canvas') !== -1) { - instance.options.url = drupalSettings.settings_tray.overridden_blocks[blockId]; + instance.options.url = settings.overridden_blocks[blockId]; } }); }