From f0fda9f625cb971fee3cc4afe69916d1522ee2cc Mon Sep 17 00:00:00 2001 From: Sztig Date: Tue, 23 Dec 2025 14:55:17 +0100 Subject: [PATCH 1/2] moved flatpickr to be included earlier in the layout --- src/bundle/Resources/encore/ibexa.js.config.js | 4 ++-- src/bundle/Resources/views/themes/admin/ui/layout.html.twig | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/bundle/Resources/encore/ibexa.js.config.js b/src/bundle/Resources/encore/ibexa.js.config.js index 0539b9fe80..35af968f9e 100644 --- a/src/bundle/Resources/encore/ibexa.js.config.js +++ b/src/bundle/Resources/encore/ibexa.js.config.js @@ -59,7 +59,6 @@ const layout = [ path.resolve(__dirname, '../public/js/scripts/admin.middle.ellipsis.js'), path.resolve(__dirname, '../public/js/scripts/admin.form.error.js'), path.resolve(__dirname, '../public/js/scripts/embedded.item.actions'), - path.resolve(__dirname, '../public/js/scripts/widgets/flatpickr.js'), path.resolve(__dirname, '../public/js/scripts/admin.form.tabs.validation.js'), path.resolve(__dirname, '../public/js/scripts/admin.search.autocomplete.js'), path.resolve(__dirname, '../public/js/scripts/admin.search.autocomplete.content.js'), @@ -261,5 +260,6 @@ module.exports = (Encore) => { path.resolve(__dirname, '../public/js/scripts/admin.notifications.filters.sidebar.js'), path.resolve(__dirname, '../public/js/scripts/admin.notifications.list.js'), path.resolve(__dirname, '../public/js/scripts/admin.notifications.filters.js'), - ]); + ]) + .addEntry('ibexa-admin-ui-flatpickr-js', path.resolve(__dirname, '../public/js/scripts/widgets/flatpickr.js'),); }; diff --git a/src/bundle/Resources/views/themes/admin/ui/layout.html.twig b/src/bundle/Resources/views/themes/admin/ui/layout.html.twig index 6811056350..7802083dbe 100644 --- a/src/bundle/Resources/views/themes/admin/ui/layout.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/layout.html.twig @@ -236,6 +236,7 @@ {{ ibexa_twig_component_group('admin-ui-layout-content-after') }} + {{ encore_entry_script_tags('ibexa-admin-ui-flatpickr-js', null, 'ibexa') }} {{ encore_entry_script_tags('ibexa-admin-ui-layout-js', null, 'ibexa') }} {{ encore_entry_script_tags('ibexa-admin-ui-udw-tabs-js', null, 'ibexa') }} {{ encore_entry_script_tags('ibexa-admin-ui-udw-extras-js', null, 'ibexa') }} From 2afa369c51277926429c64f414c6e5bcc64687ad Mon Sep 17 00:00:00 2001 From: Sztig Date: Tue, 23 Dec 2025 15:10:26 +0100 Subject: [PATCH 2/2] yarn prettier fix --- src/bundle/Resources/encore/ibexa.js.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bundle/Resources/encore/ibexa.js.config.js b/src/bundle/Resources/encore/ibexa.js.config.js index 35af968f9e..329526f101 100644 --- a/src/bundle/Resources/encore/ibexa.js.config.js +++ b/src/bundle/Resources/encore/ibexa.js.config.js @@ -261,5 +261,5 @@ module.exports = (Encore) => { path.resolve(__dirname, '../public/js/scripts/admin.notifications.list.js'), path.resolve(__dirname, '../public/js/scripts/admin.notifications.filters.js'), ]) - .addEntry('ibexa-admin-ui-flatpickr-js', path.resolve(__dirname, '../public/js/scripts/widgets/flatpickr.js'),); + .addEntry('ibexa-admin-ui-flatpickr-js', path.resolve(__dirname, '../public/js/scripts/widgets/flatpickr.js')); };