From 526dc5ace1f121c8aba55d25d7dcf7a344d55885 Mon Sep 17 00:00:00 2001 From: Devansh Date: Tue, 21 Dec 2021 17:48:55 +0530 Subject: [PATCH 1/2] TinyMCE Image Issue Fixed --- .../views/catalog/categories/create.blade.php | 2 -- .../views/catalog/categories/edit.blade.php | 2 -- .../views/catalog/products/edit.blade.php | 2 -- .../src/Resources/views/cms/create.blade.php | 2 -- .../src/Resources/views/cms/edit.blade.php | 2 -- .../Resources/views/layouts/tinymce.blade.php | 17 ++++++++++++++++- .../email-marketing/templates/create.blade.php | 2 -- .../email-marketing/templates/edit.blade.php | 2 -- .../views/settings/channels/create.blade.php | 2 -- .../views/settings/channels/edit.blade.php | 2 -- .../views/settings/sliders/create.blade.php | 2 -- .../views/settings/sliders/edit.blade.php | 2 -- 12 files changed, 16 insertions(+), 23 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php index 8c0d707a6..3773ec5ba 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php @@ -227,8 +227,6 @@ width: "100%", plugins: 'image imagetools media wordcount save fullscreen code table lists link hr', toolbar1: 'formatselect | bold italic strikethrough forecolor backcolor link hr | alignleft aligncenter alignright alignjustify | numlist bullist outdent indent | removeformat | code | table', - uploadRoute: '{{ route('admin.tinymce.upload') }}', - csrfToken: '{{ csrf_token() }}', }); }); }, diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php index 4458d6dbc..b7480b1cf 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php @@ -261,8 +261,6 @@ width: "100%", plugins: 'image imagetools media wordcount save fullscreen code table lists link hr', toolbar1: 'formatselect | bold italic strikethrough forecolor backcolor link hr | alignleft aligncenter alignright alignjustify | numlist bullist outdent indent | removeformat | code | table', - uploadRoute: '{{ route('admin.tinymce.upload') }}', - csrfToken: '{{ csrf_token() }}', }); }); } diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php index 39ad7b5bf..399cffe8d 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php @@ -221,8 +221,6 @@ plugins: 'image imagetools media wordcount save fullscreen code table lists link hr', toolbar1: 'formatselect | bold italic strikethrough forecolor backcolor link hr | alignleft aligncenter alignright alignjustify | numlist bullist outdent indent | removeformat | code | table', image_advtab: true, - uploadRoute: '{{ route('admin.tinymce.upload') }}', - csrfToken: '{{ csrf_token() }}', }); }); diff --git a/packages/Webkul/Admin/src/Resources/views/cms/create.blade.php b/packages/Webkul/Admin/src/Resources/views/cms/create.blade.php index fc370cb69..8a42b3f30 100644 --- a/packages/Webkul/Admin/src/Resources/views/cms/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/cms/create.blade.php @@ -121,8 +121,6 @@ toolbar1: 'formatselect | bold italic strikethrough forecolor backcolor alignleft aligncenter alignright alignjustify | link hr |numlist bullist outdent indent | removeformat | code | table', image_advtab: true, valid_elements : '*[*]', - uploadRoute: '{{ route('admin.tinymce.upload') }}', - csrfToken: '{{ csrf_token() }}', }); }); diff --git a/packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php index 77095ebe2..6f5eae3dc 100644 --- a/packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php @@ -136,8 +136,6 @@ toolbar1: 'formatselect | bold italic strikethrough forecolor backcolor alignleft aligncenter alignright alignjustify | link hr | numlist bullist outdent indent | removeformat | code | table', image_advtab: true, valid_elements : '*[*]', - uploadRoute: '{{ route('admin.tinymce.upload') }}', - csrfToken: '{{ csrf_token() }}', }); }); diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/tinymce.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/tinymce.blade.php index 5f487445c..c8797d799 100644 --- a/packages/Webkul/Admin/src/Resources/views/layouts/tinymce.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/tinymce.blade.php @@ -2,12 +2,27 @@ diff --git a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/templates/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/templates/edit.blade.php index 8a41e9a12..703a251f0 100755 --- a/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/templates/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/templates/edit.blade.php @@ -83,8 +83,6 @@ plugins: 'image imagetools media wordcount save fullscreen code table lists link hr', toolbar1: 'formatselect | bold italic strikethrough forecolor backcolor link hr | alignleft aligncenter alignright alignjustify | numlist bullist outdent indent | removeformat | code | table', image_advtab: true, - uploadRoute: '{{ route('admin.tinymce.upload') }}', - csrfToken: '{{ csrf_token() }}', }); }); diff --git a/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php index 1e2771169..e20963a54 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php @@ -250,8 +250,6 @@ toolbar1: 'formatselect | bold italic strikethrough forecolor backcolor link hr | alignleft aligncenter alignright alignjustify | numlist bullist outdent indent | removeformat | code | table', image_advtab: true, valid_elements : '*[*]', - uploadRoute: '{{ route('admin.tinymce.upload') }}', - csrfToken: '{{ csrf_token() }}', }); }); diff --git a/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php index 59b92cfff..fa7348f1c 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php @@ -306,8 +306,6 @@ toolbar1: 'formatselect | bold italic strikethrough forecolor backcolor link hr | alignleft aligncenter alignright alignjustify | numlist bullist outdent indent | removeformat | code | table', image_advtab: true, valid_elements : '*[*]', - uploadRoute: '{{ route('admin.tinymce.upload') }}', - csrfToken: '{{ csrf_token() }}', }); }); diff --git a/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php index 02fc54b00..800b5be72 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php @@ -124,8 +124,6 @@ { title: 'Test template 1', content: 'Test 1' }, { title: 'Test template 2', content: 'Test 2' } ], - uploadRoute: '{{ route('admin.tinymce.upload') }}', - csrfToken: '{{ csrf_token() }}', }); }); diff --git a/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php index 2cb380520..1fc532a17 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php @@ -129,8 +129,6 @@ { title: 'Test template 1', content: 'Test 1' }, { title: 'Test template 2', content: 'Test 2' } ], - uploadRoute: '{{ route('admin.tinymce.upload') }}', - csrfToken: '{{ csrf_token() }}', }); }); From 19e3a106b4b70da0563309ebb01f21edb6ece1e8 Mon Sep 17 00:00:00 2001 From: Devansh Date: Tue, 21 Dec 2021 17:51:12 +0530 Subject: [PATCH 2/2] Extra Config Removed --- .../Admin/src/Resources/views/layouts/tinymce.blade.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/tinymce.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/tinymce.blade.php index c8797d799..9b84d5e0e 100644 --- a/packages/Webkul/Admin/src/Resources/views/layouts/tinymce.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/tinymce.blade.php @@ -17,12 +17,6 @@ tinymce.init({ ...config, - relative_urls : false, - remove_script_host : true, - document_base_url : '{{ asset('/') }}', - uploadRoute: '{{ route('admin.tinymce.upload') }}', - csrfToken: '{{ csrf_token() }}', - file_picker_callback: function(cb, value, meta) { self.filePickerCallback(config, cb, value, meta); },