merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5453 from devansh-webkul/image-issue 

TinyMCE Image Issue Fixed #5450
This commit is contained in:
Glenn Hermans 2021-12-22 06:51:26 +01:00 committed by GitHub
parent 35c1ae26e3 19e3a106b4
commit 8ffbb340ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php
View File

@ -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() }}',
});
});
},

2
packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php
View File

@ -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() }}',
});
});
}

2
packages/Webkul/Admin/src/Resources/views/catalog/products/edit.blade.php
View File

@ -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() }}',
});
});
</script>

2
packages/Webkul/Admin/src/Resources/views/cms/create.blade.php
View File

@ -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() }}',
});
});
</script>

2
packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php
View File

@ -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() }}',
});
});
</script>

11
packages/Webkul/Admin/src/Resources/views/layouts/tinymce.blade.php
View File

@ -2,9 +2,18 @@
<script>
let tinyMCEHelper = {
initTinyMCE: function (config) {
initTinyMCE: function (extraConfiguration) {
let self = this;
let config = {
relative_urls : false,
remove_script_host : true,
document_base_url : '{{ asset('/') }}',
uploadRoute: '{{ route('admin.tinymce.upload') }}',
csrfToken: '{{ csrf_token() }}',
...extraConfiguration,
};
tinymce.init({
...config,

2
packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/templates/create.blade.php
View File

@ -82,8 +82,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() }}',
});
});
</script>

2
packages/Webkul/Admin/src/Resources/views/marketing/email-marketing/templates/edit.blade.php
View File

@ -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() }}',
});
});
</script>

2
packages/Webkul/Admin/src/Resources/views/settings/channels/create.blade.php
View File

@ -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() }}',
});
});
</script>

2
packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php
View File

@ -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() }}',
});
});
</script>

2
packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php
View File

@ -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() }}',
});
});
</script>

2
packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php
View File

@ -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() }}',
});
});
</script>