Merge pull request #143 from modxcms/tiny6

Tiny6

Author: matdave

.babelrc

@@ -0,0 +1,6 @@
+{
+    "plugins": ["add-module-exports"],
+    "presets": [
+        ["@babel/preset-env", { "targets": "> 0.25%, not dead" }]
+      ]
+}

.gitignore

@@ -31,3 +31,7 @@ nbproject
 ehthumbs.db
 Thumbs.db
 node_modules
+
+# Packages #
+############
+_packages

.nvmrc

@@ -0,0 +1 @@
+20

README.md

@@ -1,37 +1,25 @@
 # TinyMCE Rich Text Editor
 
-TinyMCE 5 for MODX Revolution
+TinyMCE 6 for MODX Revolution
 
 ## Features
 
 TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor. It
 allows non-technical users to format content without knowing how to code. This
-package is based on the TinyMCE 5.
+package is based on the TinyMCE 6.
 
 To build and install the package from source you have to use [Git Package
-Management](https://github.com/TheBoxer/Git-Package-Management). The GitHub
+Management (GPM)](https://github.com/TheBoxer/Git-Package-Management). The GitHub
 repository of TinyMCE Rich Text Editor contains a
-[config.json](https://github.com/modxcms/tinymce-rte/blob/tinymce5/_build/config.json)
+[config.json](https://github.com/modxcms/tinymce-rte/blob/main/_build/config.json)
 to build that package locally. Use this option, if you want to debug TinyMCE
 Rich Text Editor and/or contribute bugfixes and enhancements.
 
-To update the TinyMCE core, you have to change the `tinymce_version` property in
-the `gulpfile.js` and run the `gulp update` task afterwards. This task will
-prepare all needed files in `assets/components/tinymcerte`. Please check, wether
-the TinyMCE image and link plugins are changed in the new version of TinyMCE and
-adopt the changes in the `src/modx/plugins` files and run the `gulp prepare`
-task afterwards.
-
-To modify the MODX skin, you have to open the [TinyMCE 5 Skin
-Tool](http://skin.tiny.cloud/t5/) and upload the current
-[skintool.json](https://github.com/modxcms/tinymce-rte/blob/tinymce5/src/modx/skintool.json).
-After modifying the skin, you must click on `Get Skin` and replace the skin
-folder in the src/modx folder with the extracted downloaded skin folder. Then
-you should run the `gulp update` task. This task will prepare all needed files
-in `assets/components/tinymcerte`.
-
-There is a `gulp prepare-debug` task, that copies not uglyfied script files to
-`assets/components/tinymcerte`.
+To update the plugin run `npm install` to install the dependencies. Run 
+`npm run build` to build the plugin. The source files are located in the `/src/`
+directory. The package is compiled using Node 20.
+
+To update the TinyMCE core, you have to change the `tinymcerte.tiny_url` system setting.
 
 ## Change Log
 https://github.com/modxcms/tinymce-rte/blob/master/core/components/tinymcerte/docs/changelog.md

_build/config.json

@@ -1,9 +1,9 @@
 {
   "name": "TinyMCE Rich Text Editor",
   "lowCaseName": "tinymcerte",
-  "description": "TinyMCE 5",
+  "description": "TinyMCE 6",
   "author": "John Peca/Thomas Jakobi",
-  "version": "2.1.1",
+  "version": "3.0.0",
   "package": {
     "elements": {
       "plugins": [
@@ -23,7 +23,7 @@
     "systemSettings": [
       {
         "key": "plugins",
-        "value": "autoresize advlist autolink lists charmap print preview anchor visualblocks searchreplace code fullscreen insertdatetime media table paste modxlink modximage modai",
+        "value": "advlist autoresize autolink lists charmap preview anchor visualblocks searchreplace code fullscreen insertdatetime media table image quickbars modxlink modai",
         "area": "tinymcerte.default"
       },
       {
@@ -82,7 +82,7 @@
       },
       {
         "key": "skin",
-        "value": "modx",
+        "value": "oxide",
         "area": "tinymcerte.default"
       },
       {
@@ -124,9 +124,24 @@
         "value": "500",
         "area": "tinymcerte.default"
       },
+      {
+        "key": "min_height",
+        "value": "100",
+        "area": "tinymcerte.default"
+      },
+      {
+        "key": "insert_toolbar",
+        "value": "image media quicktable modxlink modai_generate",
+        "area": "tinymcerte.toolbar"
+      },
+      {
+        "key": "selection_toolbar",
+        "value": "bold italic underline | modxlink | modai_enhance",
+        "area": "tinymcerte.toolbar"
+      },
       {
         "key": "toolbar1",
-        "value": "undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image | modai_generate modai_enhance",
+        "value": "undo redo | styleselect | bold italic underline | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | modxlink | image",
         "area": "tinymcerte.toolbar"
       },
       {
@@ -186,6 +201,11 @@
         "area": "modai",
         "type": "textarea",
         "value": "- This is not a conversation, do not include justifcation, suggestions, or explanation\n- The output should be usable as is, without requiring editing or modification\n- Format it with HTML markup so it will work in the TinyMCE rich text editor"
+      },
+      {
+        "key": "tiny_url",
+        "area": "tinymcerte.default",
+        "value": "https://cdnjs.cloudflare.com/ajax/libs/tinymce/6.8.5/tinymce.min.js"
       }
     ]
   },

_build/resolvers/resolve.update.php

@@ -236,9 +236,17 @@ function cleanupPlugin($modx, $name)
                 addToSetting($modx, 'tinymcerte.toolbar1', '| modai_generate modai_generate_image modai_enhance');
             }
 
-            if ($oldPackage && $oldPackage->compareVersion('2.1.1-pl', '>')) {
-                removeFromSetting($modx, 'tinymcerte.toolbar1', 'modai_generate_image');
-            }
+        if ($oldPackage && $oldPackage->compareVersion('2.1.1-pl', '>')) {
+            removeFromSetting($modx, 'tinymcerte.toolbar1', 'modai_generate_image');
+        }
+
+        if ($oldPackage && $oldPackage->compareVersion('2.1.1-pl', '>')) {
+            addToSetting($modx, 'tinymcerte.plugins', 'quickbars');
+            changeSetting($modx, 'skin', 'modx', 'oxide');
+            changeSetting($modx, 'tinymcerte.toolbar1', 'link', 'modxlink');
+            changeSetting($modx, 'tinymcerte.toolbar2', 'link', 'modxlink');
+            changeSetting($modx, 'tinymcerte.toolbar3', 'link', 'modxlink');
+        }
 
             break;
     }