Merge pull request #12395 from escopecz/fix-elfinder-js-libraries

Fix elfinder js libraries
mautic · May 26, 2023 · 2ed4daa · 2ed4daa
2 parents 3448b15 + 1948468
commit 2ed4daa
Show file tree

Hide file tree

Showing 232 changed files with 9 additions and 24,563 deletions.
diff --git a/app/assets/scaffold/files/index.php b/app/assets/scaffold/files/index.php
@@ -1,6 +1,7 @@
 <?php
 
 define('MAUTIC_ROOT_DIR', __DIR__);
+define('ELFINDER_IMG_PARENT_URL', 'media/bundles/fmelfinder');
 
 // Fix for hosts that do not have date.timezone set, it will be reset based on users settings
 date_default_timezone_set('UTC');

diff --git a/app/bundles/CoreBundle/Assets/js/libraries/filemanager/index.html.twig b/app/bundles/CoreBundle/Assets/js/libraries/filemanager/index.html.twig
@@ -6,8 +6,7 @@
     <link href="{{ asset("#{prefix}/../../media/bundles/fmelfinder/css/theme.css") }}" rel="stylesheet" type="text/css">
 </head>
 <body>
-    <script src="{{ asset("#{prefix}/../../node_modules/jquery/dist/jquery.js") }}"></script>
-    <script src="{{ asset("#{prefix}/../../app/bundles/CoreBundle/Assets/js/libraries/filemanager/jquery-ui/jquery-ui.min.js") }}"></script>
+    <script src="{{ asset("#{prefix}/../../media/js/libraries.js") }}"></script>
     <script src="{{ asset("#{prefix}/../../media/bundles/fmelfinder/js/elfinder.min.js") }}"></script>
 <script type="text/javascript" charset="utf-8">
     var editorType = '';
@@ -21,7 +20,7 @@
         var $f = jQuery('.elfinder').elfinder({
             url : '{{path('ef_connect', { 'instance': instance, 'homeFolder': homeFolder } )}}',
             lang : '{{locale}}',
-            i18nBaseUrl : '{{ asset("#{prefix}/../../node_modules/bundles/fmelfinder/js/i18n/") }}',
+            i18nBaseUrl : '{{ asset("#{prefix}/../../media/bundles/fmelfinder/js/i18n/") }}',
             onlyMimes: {{ onlyMimes|raw }},
             getFileCallback : function(file, fm) {
                 let fileUrl = file.url;

diff --git a/app/bundles/CoreBundle/Assets/js/libraries/filemanager/jquery-ui/jquery-ui.min.js b/app/bundles/CoreBundle/Assets/js/libraries/filemanager/jquery-ui/jquery-ui.min.js