[5.0] tinyMCE b/c fixes

plugins/editors/tinymce/src/PluginTraits/DisplayTrait.php

@@ -412,6 +412,14 @@ public function onDisplay(
 
         // Merge the two toolbars for backwards compatibility
         $toolbar = array_merge($toolbar1, $toolbar2);
+        // Rename old toolbar buttons for B/C
+        $toolbar = str_replace(['fontselect', 'fontsizeselect', 'formatselect', 'styleselect'], ['fontfamily', 'fontsize', 'blocks', 'styles'], $toolbar);
+        $menubar = empty($menubar) ? false : implode(' ', array_unique($menubar));
+
+        // Rename old menus for B/C
+        if (is_array($menubar)) {
+            $menubar = str_replace(['fontformats', 'fontsizes', 'blockformats', 'formats'], ['fontfamily', 'fontsize', 'blocks', 'styles'], $menubar);
+        }
 
         // Build the final options set
         $scriptOptions   = array_merge(
@@ -430,7 +438,7 @@ public function onDisplay(
                 'end_container_on_empty_block' => true,
 
                 // Toolbars
-                'menubar' => empty($menubar) ? false : implode(' ', array_unique($menubar)),
+                'menubar' => $menubar,
                 'toolbar' => empty($toolbar) ? null : 'jxtdbuttons ' . implode(' ', $toolbar),
 
                 'plugins' => implode(',', array_unique($plugins)),
@@ -489,14 +497,13 @@ public function onDisplay(
         if ($levelParams->get('newlines')) {
             // Break
             $scriptOptions['force_br_newlines'] = true;
-            $scriptOptions['forced_root_block'] = '';
         } else {
             // Paragraph
             $scriptOptions['force_br_newlines'] = false;
             $scriptOptions['forced_root_block'] = 'p';
         }
 
-        $scriptOptions['rel_list'] = [
+        $scriptOptions['link_rel_list'] = [
             ['title' => 'None', 'value' => ''],
             ['title' => 'Alternate', 'value' => 'alternate'],
             ['title' => 'Author', 'value' => 'author'],

plugins/editors/tinymce/src/PluginTraits/KnownButtons.php

@@ -74,15 +74,14 @@ public static function getKnownButtons()
 
             'cut'          => ['label' => 'Cut'],
             'copy'         => ['label' => 'Copy'],
-            'paste'        => ['label' => 'Paste', 'plugin' => 'paste'],
-            'pastetext'    => ['label' => 'Paste as text', 'plugin' => 'paste'],
+            'paste'        => ['label' => 'Paste'],
             'removeformat' => ['label' => 'Clear formatting'],
 
             'language' => ['label' => 'Language'],
 
             // Buttons from the plugins
             'anchor'         => ['label' => 'Anchor', 'plugin' => 'anchor'],
-            'hr'             => ['label' => 'Horizontal line', 'plugin' => 'hr'],
+            'hr'             => ['label' => 'Horizontal line'],
             'ltr'            => ['label' => 'Left to right', 'plugin' => 'directionality'],
             'rtl'            => ['label' => 'Right to left', 'plugin' => 'directionality'],
             'code'           => ['label' => 'Source code', 'plugin' => 'code'],
@@ -96,7 +95,7 @@ public static function getKnownButtons()
             'media'          => ['label' => 'Insert/edit video', 'plugin' => 'media'],
             'image'          => ['label' => 'Insert/edit image', 'plugin' => 'image'],
             'pagebreak'      => ['label' => 'Page break', 'plugin' => 'pagebreak'],
-            'print'          => ['label' => 'Print', 'plugin' => 'print'],
+            'print'          => ['label' => 'Print'],
             'preview'        => ['label' => 'Preview', 'plugin' => 'preview'],
             'fullscreen'     => ['label' => 'Fullscreen', 'plugin' => 'fullscreen'],
             'template'       => ['label' => 'Insert template', 'plugin' => 'template'],

plugins/editors/tinymce/src/PluginTraits/ToolbarPresets.php

@@ -46,7 +46,7 @@ public static function getToolbarPreset()
                 'toolbar1' => [
                     'bold', 'italic', 'underline', 'strikethrough', '|',
                     'alignleft', 'aligncenter', 'alignright', 'alignjustify', '|',
-                    'formatselect', '|',
+                    'blocks', '|',
                     'bullist', 'numlist', '|',
                     'outdent', 'indent', '|',
                     'undo', 'redo', '|',
@@ -63,8 +63,8 @@ public static function getToolbarPreset()
                     'bold', 'italic', 'underline', 'strikethrough', '|',
                     'alignleft', 'aligncenter', 'alignright', 'alignjustify', '|',
                     'lineheight', '|',
-                    'styleselect', '|',
-                    'formatselect', 'fontfamily', 'fontsizeselect', '|',
+                    'styles', '|',
+                    'blocks', 'fontfamily', 'fontsize', '|',
                     'searchreplace', '|',
                     'bullist', 'numlist', '|',
                     'outdent', 'indent', '|',