Skip to content

Commit

Permalink
Revert tinyMCE (#1299)
Browse files Browse the repository at this point in the history
* Revert "Bump tinymce from 6.8.3 to 7.1.1 (#1262)"

This reverts commit c010130

* revert to 5.x
  • Loading branch information
jan-stanek authored Jul 11, 2024
1 parent 79da92b commit 36683c3
Show file tree
Hide file tree
Showing 3 changed files with 451 additions and 488 deletions.
10 changes: 4 additions & 6 deletions app/assets/admin/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import tinymce from 'tinymce';
import 'tinymce/themes/silver';
import 'tinymce/skins/ui/oxide/skin.css'
import 'tinymce-i18n/langs/cs';
import 'tinymce/models/dom'
import 'tinymce/icons/default/icons';
import 'tinymce/plugins/autolink';
import 'tinymce/plugins/lists';
import 'tinymce/plugins/link';
import 'tinymce/plugins/code';
import 'tinymce/plugins/fullscreen';
import 'tinymce/plugins/paste';
import contentUiCss from '!!raw-loader!tinymce/skins/ui/oxide/content.css';
import contentCss from '!!raw-loader!tinymce/skins/content/default/content.css';

Expand All @@ -26,12 +26,11 @@ tinymce.init({
skin: false,
content_css: false,
content_style: contentUiCss.toString() + '\n' + contentCss.toString(),
plugins: 'autolink lists link code fullscreen',
plugins: 'autolink lists link code fullscreen paste',
toolbar: 'undo redo | bold italic | bullist numlist | link unlink | code | fullscreen',
paste_auto_cleanup_on_paste: true,
convert_urls : false,
relative_urls: false,
license_key: 'gpl',
});

tinymce.init({
Expand All @@ -43,13 +42,12 @@ tinymce.init({
skin: false,
content_css: false,
content_style: contentUiCss.toString() + '\n' + contentCss.toString(),
plugins: 'autolink lists link code fullscreen',
toolbar: 'undo redo | blocks | bold italic | bullist numlist | link unlink | code | fullscreen',
plugins: 'autolink lists link code fullscreen paste',
toolbar: 'undo redo | formatselect | bold italic | bullist numlist | link unlink | code | fullscreen',
paste_auto_cleanup_on_paste: true,
convert_urls : false,
relative_urls: false,
block_formats: 'Paragraph=p;Heading 3=h3;Heading 4=h4;Heading 5=h5;Heading 6=h6;Preformatted=pre',
license_key: 'gpl',
});

// generování slugu
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"nette-forms": "^3.3.6",
"popper.js": "^1.16.1",
"slugify": "^1.6.6",
"tinymce": "^7.2.0",
"tinymce": "^5.10.9",
"tinymce-i18n": "^24.6.17",
"ublaboo-datagrid": "^6.9.1",
"vue-axios": "^3.4.1",
Expand Down
Loading

0 comments on commit 36683c3

Please sign in to comment.