Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Update tinyMCE and fix a problem with the theme

Roland Geider6160f56d3c65
diff --git a/package.json b/package.json
index a99f4d3a1..3d44cc883 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
"jquery": "jquery/jquery-dist#2.x",
"metrics-graphics": "mozilla/metrics-graphics#2.15.x",
"shariff": "^3.2.1",
- "tinymce": "tinymce/tinymce-dist#4.5.x"
+ "tinymce": "^4.9.11"
},
"engines": {
"yarn": ">= 1.0.0"
diff --git a/wger/core/static/js/wger-core.js b/wger/core/static/js/wger-core.js
index 5ac533be9..c453231d7 100644
--- a/wger/core/static/js/wger-core.js
+++ b/wger/core/static/js/wger-core.js
@@ -211,7 +211,6 @@ function wgerInitTinymce() {
tinyMCE.init({
// General options
mode: 'textareas',
- theme: 'silver',
width: '100%',
entity_encoding: 'raw',
diff --git a/yarn.lock b/yarn.lock
index 533ef108d..27e6c6131 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -426,9 +426,10 @@ shariff@^3.2.1:
"@fortawesome/fontawesome-free" "^5.8.2"
jquery "^3.4.1"
-tinymce@tinymce/tinymce-dist#4.5.x:
- version "4.5.12"
- resolved "https://codeload.github.com/tinymce/tinymce-dist/tar.gz/3d007282ded510e32c638b2ed5a9ffe1f219d329"
+tinymce@^4.9.11:
+ version "4.9.11"
+ resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-4.9.11.tgz#e3dae099722294c5b8d84ba7ef18dd126de6b582"
+ integrity sha512-nkSLsax+VY5DBRjMFnHFqPwTnlLEGHCco82FwJF2JNH6W+5/ClvNC1P4uhD5lXPDNiDykSHR0XJdEh7w/ICHzA==
xmlhttprequest@1:
version "1.8.0"