From 5cf9dcf8363b536eacd8f2307bc3752e83d1279a Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Tue, 22 Jun 2021 15:18:28 +0200 Subject: [PATCH] backports murph-skeleton --- assets/js/admin/admin.js | 1 + assets/js/admin/modules/editor.js | 18 +++-- assets/js/admin/modules/file-picker.js | 71 +++++++++++++++++++ core/Form/FileManager/FilePickerType.php | 37 ++++++++++ core/Resources/translations/messages.fr.yaml | 1 + .../form/bootstrap_4_form_theme.html.twig | 55 ++++++++++++++ 6 files changed, 176 insertions(+), 7 deletions(-) create mode 100644 assets/js/admin/modules/file-picker.js create mode 100644 core/Form/FileManager/FilePickerType.php diff --git a/assets/js/admin/admin.js b/assets/js/admin/admin.js index af36683..0bf8794 100644 --- a/assets/js/admin/admin.js +++ b/assets/js/admin/admin.js @@ -22,3 +22,4 @@ require('./modules/datepicker.js')() require('./modules/sortable.js')() require('./modules/batch.js')() require('./modules/file-manager.js')() +require('./modules/file-picker.js')() diff --git a/assets/js/admin/modules/editor.js b/assets/js/admin/modules/editor.js index d9e0652..a9c54c6 100644 --- a/assets/js/admin/modules/editor.js +++ b/assets/js/admin/modules/editor.js @@ -2,12 +2,12 @@ const $ = require('jquery') const Vue = require('vue').default const FileManager = require('../components/file-manager/FileManager').default -const createModal = function (url) { - let container = $('#file-manager-modal-container') +const createModal = function () { + let container = $('#fm-modal') const body = $('body') if (!container.length) { - container = $('