From 923174d8fe55be73065aef673ad876a9f4661676 Mon Sep 17 00:00:00 2001 From: "Pedro X." Date: Wed, 1 Nov 2023 20:55:51 +0000 Subject: [PATCH 1/5] wip --- resources/views/ckeditor5.blade.php | 98 +++++++++++++++++++ src/FileManagerServiceProvider.php | 11 ++- .../BackpackElfinderController.php | 13 +++ 3 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 resources/views/ckeditor5.blade.php create mode 100644 src/Http/Controllers/BackpackElfinderController.php diff --git a/resources/views/ckeditor5.blade.php b/resources/views/ckeditor5.blade.php new file mode 100644 index 0000000..715ea21 --- /dev/null +++ b/resources/views/ckeditor5.blade.php @@ -0,0 +1,98 @@ + + + + + @include('vendor.elfinder.common_scripts') + @include('vendor.elfinder.common_styles', ['styleBodyElement' => true]) + + + + + + + +

+ + + diff --git a/src/FileManagerServiceProvider.php b/src/FileManagerServiceProvider.php index 11a37a4..d0741a6 100644 --- a/src/FileManagerServiceProvider.php +++ b/src/FileManagerServiceProvider.php @@ -3,6 +3,7 @@ namespace Backpack\FileManager; use Backpack\Basset\Facades\Basset; +use Illuminate\Routing\Router; use Illuminate\Support\Facades\Config; use Illuminate\Support\ServiceProvider; @@ -17,12 +18,20 @@ class FileManagerServiceProvider extends ServiceProvider * * @return void */ - public function boot() + public function boot(Router $router) { // Publishing is only necessary when using the CLI. if ($this->app->runningInConsole()) { $this->bootForConsole(); } + + $config = $this->app['config']->get('elfinder.route', []); + $config['namespace'] = 'Backpack\FileManager\Http\Controllers'; + + $router->group($config, function($router) + { + $router->get('ckeditor5', ['as' => 'elfinder.ckeditor5', 'uses' => 'BackpackElfinderController@showCKeditor5']); + }); } /** diff --git a/src/Http/Controllers/BackpackElfinderController.php b/src/Http/Controllers/BackpackElfinderController.php new file mode 100644 index 0000000..e727332 --- /dev/null +++ b/src/Http/Controllers/BackpackElfinderController.php @@ -0,0 +1,13 @@ +app['view'] + ->make($this->package . '::ckeditor5') + ->with($this->getViewVars()); + } +} \ No newline at end of file From e5e8fc831d1f4efde7712efe316412453b4cdef3 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Wed, 1 Nov 2023 20:56:03 +0000 Subject: [PATCH 2/5] Apply fixes from StyleCI --- src/FileManagerServiceProvider.php | 5 ++--- src/Http/Controllers/BackpackElfinderController.php | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/FileManagerServiceProvider.php b/src/FileManagerServiceProvider.php index d0741a6..91ea29c 100644 --- a/src/FileManagerServiceProvider.php +++ b/src/FileManagerServiceProvider.php @@ -28,9 +28,8 @@ public function boot(Router $router) $config = $this->app['config']->get('elfinder.route', []); $config['namespace'] = 'Backpack\FileManager\Http\Controllers'; - $router->group($config, function($router) - { - $router->get('ckeditor5', ['as' => 'elfinder.ckeditor5', 'uses' => 'BackpackElfinderController@showCKeditor5']); + $router->group($config, function ($router) { + $router->get('ckeditor5', ['as' => 'elfinder.ckeditor5', 'uses' => 'BackpackElfinderController@showCKeditor5']); }); } diff --git a/src/Http/Controllers/BackpackElfinderController.php b/src/Http/Controllers/BackpackElfinderController.php index e727332..7cf1fa4 100644 --- a/src/Http/Controllers/BackpackElfinderController.php +++ b/src/Http/Controllers/BackpackElfinderController.php @@ -7,7 +7,7 @@ class BackpackElfinderController extends \Barryvdh\Elfinder\ElfinderController public function showCKeditor5() { return $this->app['view'] - ->make($this->package . '::ckeditor5') + ->make($this->package.'::ckeditor5') ->with($this->getViewVars()); } -} \ No newline at end of file +} From cbd4bfe46f2a4c31dfdd931744c1308711dd9207 Mon Sep 17 00:00:00 2001 From: "Pedro X." Date: Wed, 22 May 2024 16:19:59 +0100 Subject: [PATCH 3/5] bump versions --- resources/views/common_scripts.blade.php | 6 +++--- resources/views/common_styles.blade.php | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/views/common_scripts.blade.php b/resources/views/common_scripts.blade.php index e4bd28f..c2daffa 100644 --- a/resources/views/common_scripts.blade.php +++ b/resources/views/common_scripts.blade.php @@ -9,12 +9,12 @@ @basset('jquery-ui-1.13.2/jquery-ui-1.13.2/dist/jquery-ui.min.js') {{-- elFinder JS (REQUIRED) --}} - @bassetArchive('https://github.com/Studio-42/elFinder/archive/refs/tags/2.1.62.tar.gz', 'elfinder-2.1.62') - @basset('elfinder-2.1.62/elFinder-2.1.62/js/elfinder.min.js') + @bassetArchive('https://github.com/Studio-42/elFinder/archive/refs/tags/2.1.64.tar.gz', 'elfinder-2.1.64') + @basset('elfinder-2.1.64/elFinder-2.1.64/js/elfinder.min.js') {{-- elFinder translation (OPTIONAL) --}} @if($locale) - @basset('https://cdnjs.cloudflare.com/ajax/libs/elfinder/2.1.62/js/i18n/elfinder.'.$locale.'.min.js') + @basset('https://cdnjs.cloudflare.com/ajax/libs/elfinder/2.1.64/js/i18n/elfinder.'.$locale.'.min.js') @endif {{-- elFinder sounds --}} diff --git a/resources/views/common_styles.blade.php b/resources/views/common_styles.blade.php index d809cff..cabe921 100644 --- a/resources/views/common_styles.blade.php +++ b/resources/views/common_styles.blade.php @@ -4,8 +4,8 @@ @php $themeStylesheetVersion = '3.0.0'; @endphp -@bassetArchive('https://github.com/Studio-42/elFinder/archive/refs/tags/2.1.62.tar.gz', 'elfinder-2.1.62') -@basset('elfinder-2.1.62/elFinder-2.1.62/css/elfinder.min.css') +@bassetArchive('https://github.com/Studio-42/elFinder/archive/refs/tags/2.1.64.tar.gz', 'elfinder-2.1.64') +@basset('elfinder-2.1.64/elFinder-2.1.64/css/elfinder.min.css') @basset('https://cdn.jsdelivr.net/gh/RobiNN1/elFinder-Material-Theme@'.$themeStylesheetVersion.'/Material/css/theme.min.css') @basset('https://cdn.jsdelivr.net/gh/RobiNN1/elFinder-Material-Theme@'.$themeStylesheetVersion.'/Material/images/loading.svg', false) @basset('https://cdn.jsdelivr.net/gh/RobiNN1/elFinder-Material-Theme@'.$themeStylesheetVersion.'/Material/font/material.eot', false) @@ -62,8 +62,8 @@ function addElfinderLightStylesheet() { if(colorMode) { let colorModeClass = window.parent.colorMode ?? window.colorMode; colorModeClass.onChange(function(scheme) { - let styleSheetType = scheme === 'dark' ? false : true; - let selectedLinkElement = getElfinderStyleSheet(styleSheetType); + let getMainStylesheet = scheme === 'dark' ? false : true; + let selectedLinkElement = getElfinderStyleSheet(getMainStylesheet); if (! selectedLinkElement) { return true; From b0b8be76d0bca35635dd5d6bad55894bc93ec883 Mon Sep 17 00:00:00 2001 From: "Pedro X." Date: Fri, 24 May 2024 15:13:34 +0100 Subject: [PATCH 4/5] update standalone popup to accept extra elfinder options --- resources/views/ckeditor5.blade.php | 98 ----------------------- resources/views/common_scripts.blade.php | 2 +- resources/views/standalonepopup.blade.php | 10 +-- src/FileManagerServiceProvider.php | 7 -- 4 files changed, 5 insertions(+), 112 deletions(-) delete mode 100644 resources/views/ckeditor5.blade.php diff --git a/resources/views/ckeditor5.blade.php b/resources/views/ckeditor5.blade.php deleted file mode 100644 index 715ea21..0000000 --- a/resources/views/ckeditor5.blade.php +++ /dev/null @@ -1,98 +0,0 @@ - - - - - @include('vendor.elfinder.common_scripts') - @include('vendor.elfinder.common_styles', ['styleBodyElement' => true]) - - - - - - - -

- - - diff --git a/resources/views/common_scripts.blade.php b/resources/views/common_scripts.blade.php index c2daffa..650218f 100644 --- a/resources/views/common_scripts.blade.php +++ b/resources/views/common_scripts.blade.php @@ -1,6 +1,6 @@ {{-- jQuery (REQUIRED) --}} @if (!isset ($jquery) || (isset($jquery) && $jquery == true)) - @basset('https://unpkg.com/jquery@3.6.4/dist/jquery.min.js') + @basset('https://unpkg.com/jquery@3.6.1/dist/jquery.min.js') @endif {{-- jQuery UI and Smoothness theme --}} diff --git a/resources/views/standalonepopup.blade.php b/resources/views/standalonepopup.blade.php index 4f2c5a3..37f3af4 100644 --- a/resources/views/standalonepopup.blade.php +++ b/resources/views/standalonepopup.blade.php @@ -31,7 +31,6 @@ }, url: '{{ route("elfinder.connector") }}', // connector URL soundPath: '{{ Basset::getUrl(base_path("vendor/studio-42/elfinder/sounds")) }}', - dialog: {width: 900, modal: true, title: 'Select a file'}, resizable: false, onlyMimes: @json(unserialize(urldecode(request('mimes'))), JSON_UNESCAPED_SLASHES), commandsOptions: { @@ -40,20 +39,19 @@ oncomplete: 'destroy' } }, - getFileCallback: function (file) { + getFileCallback: (file) => { @if (request()->has('multiple') && request()->input('multiple') == 1) window.parent.processSelectedMultipleFiles(file, '{{ $input_id }}'); @else window.parent.processSelectedFile(file.path, '{{ $input_id }}'); @endif - window.parent.jQuery.colorbox.close(); }, }; + let elfinderOptions = window.parent.elfinderOptions ?? {}; + var elf = $('#elfinder').elfinder({...elfinderConfig, ...elfinderOptions}).elfinder('instance'); - var elf = $('#elfinder').elfinder(elfinderConfig); - document.getElementById('elfinder').style.opacity = 1; - + document.getElementById('elfinder').style.opacity = 1; }); diff --git a/src/FileManagerServiceProvider.php b/src/FileManagerServiceProvider.php index 91ea29c..fb74527 100644 --- a/src/FileManagerServiceProvider.php +++ b/src/FileManagerServiceProvider.php @@ -24,13 +24,6 @@ public function boot(Router $router) if ($this->app->runningInConsole()) { $this->bootForConsole(); } - - $config = $this->app['config']->get('elfinder.route', []); - $config['namespace'] = 'Backpack\FileManager\Http\Controllers'; - - $router->group($config, function ($router) { - $router->get('ckeditor5', ['as' => 'elfinder.ckeditor5', 'uses' => 'BackpackElfinderController@showCKeditor5']); - }); } /** From 050ec86eb6f176d66d3b75cebd564ae66dc3c00b Mon Sep 17 00:00:00 2001 From: "Pedro X." Date: Fri, 24 May 2024 15:15:40 +0100 Subject: [PATCH 5/5] remove uneeded --- src/FileManagerServiceProvider.php | 3 +-- src/Http/Controllers/BackpackElfinderController.php | 13 ------------- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 src/Http/Controllers/BackpackElfinderController.php diff --git a/src/FileManagerServiceProvider.php b/src/FileManagerServiceProvider.php index fb74527..11a37a4 100644 --- a/src/FileManagerServiceProvider.php +++ b/src/FileManagerServiceProvider.php @@ -3,7 +3,6 @@ namespace Backpack\FileManager; use Backpack\Basset\Facades\Basset; -use Illuminate\Routing\Router; use Illuminate\Support\Facades\Config; use Illuminate\Support\ServiceProvider; @@ -18,7 +17,7 @@ class FileManagerServiceProvider extends ServiceProvider * * @return void */ - public function boot(Router $router) + public function boot() { // Publishing is only necessary when using the CLI. if ($this->app->runningInConsole()) { diff --git a/src/Http/Controllers/BackpackElfinderController.php b/src/Http/Controllers/BackpackElfinderController.php deleted file mode 100644 index 7cf1fa4..0000000 --- a/src/Http/Controllers/BackpackElfinderController.php +++ /dev/null @@ -1,13 +0,0 @@ -app['view'] - ->make($this->package.'::ckeditor5') - ->with($this->getViewVars()); - } -}