Skip to content

Commit

Permalink
feat(editor): removed TinyMCE, added Jodit Editor (#3310)
Browse files Browse the repository at this point in the history
Missing: phpMyFAQ plugin
  • Loading branch information
thorsten authored Jan 1, 2025
1 parent beef02d commit 69657ed
Show file tree
Hide file tree
Showing 13 changed files with 554 additions and 530 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ This is a log of major user-visible changes in each phpMyFAQ release.
### phpMyFAQ v4.1.0-dev - unreleased

- added configuration to edit robots.txt (Thorsten)
- WIP: added Symfony Routing for administration backend (Thorsten)
- added Symfony Routing for administration backend (Thorsten)
- WIP: migrated from WYSIWYG editor from TinyMCE to Jodit Editor (Thorsten)
- removed Webpack, now using Vite v6 (Thorsten)
- migrated from Jest to vitest (Thorsten)

Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
"bootstrap-icons": "^1.11.3",
"chart.js": "^4.4.7",
"handlebars": "4.7.8",
"highlight.js": "^11.11.0",
"highlight.js": "^11.11.1",
"jodit": "^4.2.47",
"masonry-layout": "^4.2.2",
"sortablejs": "^1.15.6",
"tinymce": "^6.8.5",
"vanilla-cookieconsent": "^3.0.1"
},
"devDependencies": {
Expand All @@ -61,7 +61,7 @@
"rollup-plugin-sbom": "^1.1.1",
"sass": "^1.83.0",
"sigmund": "^1.0.1",
"vite": "^6.0.5",
"vite": "^6.0.6",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-html": "^3.2.2",
"vite-plugin-minify": "^2.1.0",
Expand Down
24 changes: 1 addition & 23 deletions phpmyfaq/admin/assets/scss/layout/_editor.scss
Original file line number Diff line number Diff line change
@@ -1,26 +1,4 @@
//
// TinyMCE
//

label.mce-label {
max-width: none;
}

.mce-file {
cursor: pointer;
line-height: 36px;

&:hover {
text-decoration: underline;
}
}

.mce-file-preview {
border: 1px solid $gray-900;
margin-right: 16px;
max-height: 32px;
max-width: 32px;
}
@import 'jodit/es2015/jodit.min.css';

.truncate-question {
display: inline-block;
Expand Down
Loading

0 comments on commit 69657ed

Please sign in to comment.