#9366 Upgrade to TinyMCE6 (#10773)

* #9366 Upgrade tinymce from v5 to v6 * #9366 Resolve cypress issue with tinymce upgrade * #9366 Upgrade tinymce from v6 to v7 * #9366 Remove menubar in tinymce
pkp · Jan 27, 2025 · 1165ce9 · 1165ce9
1 parent 3f903cb
commit 1165ce9
Show file tree

Hide file tree

Showing 18 changed files with 11,120 additions and 11,094 deletions.
diff --git a/classes/components/forms/FieldRichText.php b/classes/components/forms/FieldRichText.php
@@ -32,7 +32,7 @@ class FieldRichText extends Field
     public $toolbar = 'formatgroup';
 
     /** @var array Optional. A list of required plugins. */
-    public $plugins = 'paste';
+    public $plugins = [];
 
     /** @var string Optional. A list of comma separated elements. */
     public $invalidElements;

diff --git a/classes/components/forms/FieldRichTextarea.php b/classes/components/forms/FieldRichTextarea.php
@@ -24,7 +24,7 @@ class FieldRichTextarea extends Field
     public $init;
 
     /** @var array Optional. A list of required plugins. */
-    public $plugins = 'paste,link,noneditable';
+    public $plugins = ['link'];
 
     /** @var string Optional. A preset size option. */
     public $size;

diff --git a/classes/components/forms/announcement/PKPAnnouncementForm.php b/classes/components/forms/announcement/PKPAnnouncementForm.php
@@ -61,7 +61,7 @@ public function __construct($action, $locales, string $baseUrl, string $temporar
                 'isMultilingual' => true,
                 'size' => 'large',
                 'toolbar' => 'bold italic superscript subscript | link | blockquote bullist numlist',
-                'plugins' => 'paste,link,lists',
+                'plugins' => ['link','lists'],
             ]))
             ->addField(new FieldUploadImage('image', [
                 'label' => __('manager.image'),

diff --git a/classes/components/forms/context/PKPAppearanceAdvancedForm.php b/classes/components/forms/context/PKPAppearanceAdvancedForm.php
@@ -65,7 +65,7 @@ public function __construct($action, $locales, $context, $baseUrl, $temporaryFil
                 'isMultilingual' => true,
                 'value' => $context->getData('additionalHomeContent'),
                 'toolbar' => 'bold italic superscript subscript | link | blockquote bullist numlist | image | code',
-                'plugins' => 'paste,link,lists,image,code',
+                'plugins' => ['link','lists','image','code'],
                 'uploadUrl' => $imageUploadUrl,
             ]));
     }

diff --git a/classes/components/forms/context/PKPAppearanceSetupForm.php b/classes/components/forms/context/PKPAppearanceSetupForm.php
@@ -80,7 +80,7 @@ public function __construct($action, $locales, $context, $baseUrl, $temporaryFil
                 'isMultilingual' => true,
                 'value' => $context->getData('pageFooter'),
                 'toolbar' => 'bold italic superscript subscript | link | blockquote bullist numlist | image | code',
-                'plugins' => 'paste,link,lists,image,code',
+                'plugins' => ['link','lists','image','code'],
                 'uploadUrl' => $imageUploadUrl,
             ]))
             ->addField(new FieldOptions('sidebar', [

diff --git a/classes/components/forms/context/PKPInformationForm.php b/classes/components/forms/context/PKPInformationForm.php
@@ -49,7 +49,7 @@ public function __construct($action, $locales, $context, $imageUploadUrl)
                 'groupId' => 'descriptions',
                 'value' => $context->getData('readerInformation'),
                 'toolbar' => 'bold italic superscript subscript | link | blockquote bullist numlist | image | code',
-                'plugins' => 'paste,link,lists,image,code',
+                'plugins' => ['link','lists','image','code'],
                 'uploadUrl' => $imageUploadUrl,
             ]))
             ->addField(new FieldRichTextarea('authorInformation', [
@@ -58,7 +58,7 @@ public function __construct($action, $locales, $context, $imageUploadUrl)
                 'groupId' => 'descriptions',
                 'value' => $context->getData('authorInformation'),
                 'toolbar' => 'bold italic superscript subscript | link | blockquote bullist numlist | image | code',
-                'plugins' => 'paste,link,lists,image,code',
+                'plugins' => ['link','lists','image','code'],
                 'uploadUrl' => $imageUploadUrl,
             ]))
             ->addField(new FieldRichTextarea('librarianInformation', [
@@ -67,7 +67,7 @@ public function __construct($action, $locales, $context, $imageUploadUrl)
                 'groupId' => 'descriptions',
                 'value' => $context->getData('librarianInformation'),
                 'toolbar' => 'bold italic superscript subscript | link | blockquote bullist numlist | image | code',
-                'plugins' => 'paste,link,lists,image,code',
+                'plugins' => ['link','lists','image','code'],
                 'uploadUrl' => $imageUploadUrl,
             ]));
     }

diff --git a/classes/components/forms/context/PKPLicenseForm.php b/classes/components/forms/context/PKPLicenseForm.php
@@ -82,7 +82,7 @@ public function __construct($action, $locales, $context)
                 'isMultilingual' => true,
                 'value' => $context->getData('licenseTerms'),
                 'toolbar' => 'bold italic superscript subscript | link | blockquote bullist numlist',
-                'plugins' => 'paste,link,lists',
+                'plugins' => ['link','lists'],
             ]));
     }
 }
diff --git a/classes/components/forms/context/PKPMastheadForm.php b/classes/components/forms/context/PKPMastheadForm.php
@@ -94,7 +94,7 @@ public function __construct($action, $locales, $context, $imageUploadUrl)
                 'isMultilingual' => true,
                 'groupId' => 'editorialMasthead',
                 'toolbar' => 'bold italic superscript subscript | link | blockquote bullist numlist | image | code',
-                'plugins' => 'paste,link,lists,image,code',
+                'plugins' => ['link','lists','image','code'],
                 'uploadUrl' => $imageUploadUrl,
                 'value' => $context->getData('editorialHistory'),
             ]))
@@ -116,7 +116,7 @@ public function __construct($action, $locales, $context, $imageUploadUrl)
                 'size' => 'large',
                 'groupId' => 'about',
                 'toolbar' => 'bold italic superscript subscript | link | blockquote bullist numlist | image | code',
-                'plugins' => 'paste,link,lists,image,code',
+                'plugins' => ['link','lists','image','code'],
                 'uploadUrl' => $imageUploadUrl,
                 'value' => $context->getData('about'),
             ]));

diff --git a/classes/components/forms/context/PKPPrivacyForm.php b/classes/components/forms/context/PKPPrivacyForm.php
@@ -43,7 +43,7 @@ public function __construct($action, $locales, $context, $imageUploadUrl)
             'isMultilingual' => true,
             'value' => $context->getData('privacyStatement'),
             'toolbar' => 'bold italic superscript subscript | link | blockquote bullist numlist | image | code',
-            'plugins' => 'paste,link,lists,image,code',
+            'plugins' => ['link','lists','image','code'],
             'uploadUrl' => $imageUploadUrl,
         ]));
     }

diff --git a/classes/components/forms/context/PKPReviewGuidanceForm.php b/classes/components/forms/context/PKPReviewGuidanceForm.php
@@ -42,14 +42,14 @@ public function __construct($action, $locales, $context)
             'isMultilingual' => true,
             'value' => $context->getData('reviewGuidelines'),
             'toolbar' => 'bold italic superscript subscript | link | blockquote bullist numlist',
-            'plugins' => 'paste,link,lists',
+            'plugins' => ['link','lists'],
         ]))
             ->addField(new FieldRichTextarea('competingInterests', [
                 'label' => __('manager.setup.competingInterests'),
                 'isMultilingual' => true,
                 'value' => $context->getData('competingInterests'),
                 'toolbar' => 'bold italic superscript subscript | link | blockquote bullist numlist',
-                'plugins' => 'paste,link,lists',
+                'plugins' => ['link','lists'],
             ]))
             ->addField(new FieldShowEnsuringLink('showEnsuringLink', [
                 'options' => [

diff --git a/classes/components/forms/emailTemplate/EmailTemplateForm.php b/classes/components/forms/emailTemplate/EmailTemplateForm.php
@@ -45,7 +45,7 @@ public function __construct(string $action, array $locales)
                 'size' => 'large',
                 'isMultilingual' => true,
                 'toolbar' => 'bold italic superscript subscript | link | blockquote bullist numlist',
-                'plugins' => 'paste,link,lists',
+                'plugins' => ['link','lists'],
             ]));
     }
 }
diff --git a/classes/components/forms/submission/SubmissionGuidanceSettings.php b/classes/components/forms/submission/SubmissionGuidanceSettings.php
@@ -47,71 +47,71 @@ public function __construct(string $action, array $locales, Context $context)
             'isMultilingual' => true,
             'value' => $context->getData('authorGuidelines'),
             'toolbar' => 'bold italic superscript subscript | link | blockquote bullist numlist',
-            'plugins' => 'paste,link,lists',
+            'plugins' => ['link','lists'],
         ]))
             ->addField(new FieldRichTextarea('beginSubmissionHelp', [
                 'label' => __('submission.wizard.beforeStart'),
                 'description' => __('manager.setup.workflow.beginSubmissionHelp.description'),
                 'isMultilingual' => true,
                 'value' => $context->getData('beginSubmissionHelp'),
                 'toolbar' => 'bold italic superscript subscript | link | blockquote bullist numlist',
-                'plugins' => 'paste,link,lists',
+                'plugins' => ['link','lists'],
             ]))
             ->addField(new FieldRichTextarea('submissionChecklist', [
                 'label' => __('manager.setup.submissionPreparationChecklist'),
                 'description' => __('manager.setup.submissionPreparationChecklistDescription'),
                 'isMultilingual' => true,
                 'value' => $context->getData('submissionChecklist'),
                 'toolbar' => 'bold italic superscript subscript | link | blockquote bullist numlist',
-                'plugins' => 'paste,link,lists',
+                'plugins' => ['link','lists'],
             ]))
             ->addField(new FieldRichTextarea('uploadFilesHelp', [
                 'label' => __('submission.upload.uploadFiles'),
                 'description' => __('manager.setup.workflow.uploadFilesHelp.description'),
                 'isMultilingual' => true,
                 'value' => $context->getData('uploadFilesHelp'),
                 'toolbar' => 'bold italic superscript subscript | link | blockquote bullist numlist',
-                'plugins' => 'paste,link,lists',
+                'plugins' => ['link','lists'],
             ]))
             ->addField(new FieldRichTextarea('contributorsHelp', [
                 'label' => __('publication.contributors'),
                 'description' => __('manager.setup.workflow.contributorsHelp.description'),
                 'isMultilingual' => true,
                 'value' => $context->getData('contributorsHelp'),
                 'toolbar' => 'bold italic superscript subscript | link | blockquote bullist numlist',
-                'plugins' => 'paste,link,lists',
+                'plugins' => ['link','lists'],
             ]))
             ->addField(new FieldRichTextarea('detailsHelp', [
                 'label' => __('common.details'),
                 'description' => __('manager.setup.workflow.detailsHelp.description'),
                 'isMultilingual' => true,
                 'value' => $context->getData('detailsHelp'),
                 'toolbar' => 'bold italic superscript subscript | link | blockquote bullist numlist',
-                'plugins' => 'paste,link,lists',
+                'plugins' => ['link','lists'],
             ]))
             ->addField(new FieldRichTextarea('forTheEditorsHelp', [
                 'label' => __('submission.forTheEditors'),
                 'description' => __('manager.setup.workflow.forTheEditorsHelp.description'),
                 'isMultilingual' => true,
                 'value' => $context->getData('forTheEditorsHelp'),
                 'toolbar' => 'bold italic superscript subscript | link | blockquote bullist numlist',
-                'plugins' => 'paste,link,lists',
+                'plugins' => ['link','lists'],
             ]))
             ->addField(new FieldRichTextarea('reviewHelp', [
                 'label' => __('submission.reviewAndSubmit'),
                 'description' => __('manager.setup.workflow.reviewHelp.description'),
                 'isMultilingual' => true,
                 'value' => $context->getData('reviewHelp'),
                 'toolbar' => 'bold italic superscript subscript | link | blockquote bullist numlist',
-                'plugins' => 'paste,link,lists',
+                'plugins' => ['link','lists'],
             ]))
             ->addField(new FieldRichTextarea('copyrightNotice', [
                 'label' => __('manager.setup.copyrightNotice'),
                 'description' => __('manager.setup.copyrightNotice.description', ['url' => $submissionUrl]),
                 'isMultilingual' => true,
                 'value' => $context->getData('copyrightNotice'),
                 'toolbar' => 'bold italic superscript subscript | link | blockquote bullist numlist',
-                'plugins' => 'paste,link,lists',
+                'plugins' => ['link','lists'],
             ]));
     }
 }
diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
 		"sokil/php-isocodes": "^4.1",
 		"sokil/php-isocodes-db-i18n": "^4.0",
 		"symfony/mailer": "^7.0",
-		"tinymce/tinymce": "^5.7",
+		"tinymce/tinymce": "^7.6",
 		"wikimedia/less.php": "3.*"
 	},
 	"require-dev": {