Upgrade TinyMCE to version 5.10

andrewwshka · May 17, 2022 · f2f4026 · f2f4026
1 parent 246e122
commit f2f4026
Show file tree

Hide file tree

Showing 17 changed files with 66 additions and 2,893 deletions.
diff --git a/composer.json b/composer.json
@@ -60,7 +60,7 @@
     "symfony/yaml": "^5.2",
     "tecnickcom/tcpdf": "^6.4",
     "tedivm/jshrink": "^1.3",
-    "tinymce/tinymce": "^4.9.11",
+    "tinymce/tinymce": "^5.10",
     "tuupola/slim-jwt-auth": "^2.0",
     "vlucas/phpdotenv": "^3.5",
     "voku/anti-xss": "^4.0",

diff --git a/composer.lock b/composer.lock
diff --git a/include/SuiteEditor/SuiteEditorConnector.php b/include/SuiteEditor/SuiteEditorConnector.php
@@ -75,8 +75,11 @@ public static function getSuiteSettings($html, $width)
                         onClickTemplateBody();
                     });
                 },
+                height : '480',
                 plugins: ['code', 'table', 'link', 'image'],
-            }");
+                toolbar: ['fontselect | fontsizeselect | bold italic underline | forecolor backcolor | styleselect | outdent indent | link image'],
+            }"
+        );
     }
 
     /**

diff --git a/modules/Emails/include/ComposeView/EmailsComposeView.js b/modules/Emails/include/ComposeView/EmailsComposeView.js
@@ -1125,11 +1125,14 @@
 
           if ($(self).find('#is_only_plain_text').length === 1) {
             $(self).find('#is_only_plain_text').click(function () {
-              var tinemceToolbar = $(tinymce.EditorManager.activeEditor.getContainer()).find('.mce-toolbar');
+              let tinymceContainer = $(tinymce.EditorManager.activeEditor.getContainer());
+              let description = $(self).find('#description');
               if ($('#is_only_plain_text').prop('checked')) {
-                tinemceToolbar.hide();
+                tinymceContainer.hide();
+                description.show();
               } else {
-                tinemceToolbar.show();
+                description.hide();
+                tinymceContainer.show();
               }
             });
           }
@@ -1383,19 +1386,16 @@
 
   $.fn.EmailsComposeView.defaults = {
     "tinyMceOptions": {
-      skin_url: "themes/default/css",
-      skin: "",
-      plugins: "fullscreen textcolor",
       menubar: false,
-      toolbar: ['fontselect | fontsizeselect | bold italic underline forecolor backcolor | styleselect'],
+      toolbar: ['fontselect | fontsizeselect | bold italic underline | forecolor backcolor | styleselect | outdent indent'],
       formats: {
         bold: {inline: 'b'},
         italic: {inline: 'i'},
         underline: {inline: 'u'}
       },
-      convert_urls:true,
-      relative_urls:false,
-      remove_script_host:false,
+      convert_urls: true,
+      relative_urls: false,
+      remove_script_host: false,
     }
   };
 }(jQuery));
diff --git a/themes/SuiteP/css/Dawn/style.css b/themes/SuiteP/css/Dawn/style.css
diff --git a/themes/SuiteP/css/Dawn/style.scss b/themes/SuiteP/css/Dawn/style.scss
@@ -79,7 +79,7 @@
 @import '../suitep-base/modal';
 @import '../suitep-base/popup';
 @import '../suitep-base/studio';
-@import '../suitep-base/tinemce.scss';
+@import '../suitep-base/tinymce.scss';
 @import '../suitep-base/jstree';
 @import '../suitep-base/search';
 //
diff --git a/themes/SuiteP/css/Day/style.css b/themes/SuiteP/css/Day/style.css
diff --git a/themes/SuiteP/css/Day/style.scss b/themes/SuiteP/css/Day/style.scss
@@ -80,6 +80,6 @@
 @import '../suitep-base/modal';
 @import '../suitep-base/popup';
 @import '../suitep-base/studio';
-@import '../suitep-base/tinemce.scss';
+@import '../suitep-base/tinymce.scss';
 @import '../suitep-base/jstree';
 //
diff --git a/themes/SuiteP/css/Dusk/style.css b/themes/SuiteP/css/Dusk/style.css
diff --git a/themes/SuiteP/css/Dusk/style.scss b/themes/SuiteP/css/Dusk/style.scss
@@ -79,7 +79,7 @@
 @import '../suitep-base/modal';
 @import '../suitep-base/popup';
 @import '../suitep-base/studio';
-@import '../suitep-base/tinemce.scss';
+@import '../suitep-base/tinymce.scss';
 @import '../suitep-base/jstree';
 @import '../suitep-base/search';
 //
diff --git a/themes/SuiteP/css/Night/style.css b/themes/SuiteP/css/Night/style.css
diff --git a/themes/SuiteP/css/Night/style.scss b/themes/SuiteP/css/Night/style.scss
@@ -79,6 +79,6 @@
 @import '../suitep-base/modal';
 @import '../suitep-base/popup';
 @import '../suitep-base/studio';
-@import '../suitep-base/tinemce.scss';
+@import '../suitep-base/tinymce.scss';
 @import '../suitep-base/jstree';
 //
diff --git a/themes/SuiteP/css/Noon/style.css b/themes/SuiteP/css/Noon/style.css
diff --git a/themes/SuiteP/css/Noon/style.scss b/themes/SuiteP/css/Noon/style.scss
@@ -79,7 +79,7 @@
 @import '../suitep-base/modal';
 @import '../suitep-base/popup';
 @import '../suitep-base/studio';
-@import '../suitep-base/tinemce.scss';
+@import '../suitep-base/tinymce.scss';
 @import '../suitep-base/jstree';
 @import '../suitep-base/search';
 //