Merge pull request #139 from anstiftung/issue-125-replace-ckeditor

Issue 125 replace ckeditor
anstiftung · Feb 15, 2024 · 4899c4c · 4899c4c
2 parents c76593b + 0982547
commit 4899c4c
Show file tree

Hide file tree

Showing 26 changed files with 274 additions and 291 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -4,12 +4,15 @@ module.exports = {
         "jquery": true,
         "es6": true
     },
+    "parserOptions": {
+        "ecmaVersion": 2020
+    },
     "ignorePatterns": ["webroot/js/elFinder/"],
     "globals": {
         "Chart": true,
         "ChartDataLabels": true,
-        "CKEDITOR": true,
         "ClipboardJS": true,
+        "Jodit": true,
         "MappedRepairEvents": true,
         "PruneCluster": true,
         "PruneClusterForLeaflet": true,

diff --git a/config/app_config.php b/config/app_config.php
@@ -18,9 +18,9 @@
 define('CACHE_PERSISTENT_DIR', CACHE_DIR . 'persistent/');
 define('CACHE_VIEWS_DIR', CACHE_DIR . 'views/');
 
-define('ALLOWED_TAGS_CKEDITOR_USER', '<a><b><strong><i><img><p><h1><h2><ul><li><hr><em><br>');
-define('ALLOWED_TAGS_CKEDITOR_ADMIN', ALLOWED_TAGS_CKEDITOR_USER . '<iframe>');
-define('ALLOWED_TAGS_USER', '<a><b><strong><i><br><p><ul><li>'); // für textfelder (zb. additional_contact)
+define('ALLOWED_TAGS_EDITOR_USER', '<a><b><strong><i><img><p><h1><h2><h3><ul><ol><li><hr><em><br>');
+define('ALLOWED_TAGS_EDITOR_ADMIN', ALLOWED_TAGS_EDITOR_USER . '<iframe>');
+define('ALLOWED_TAGS_USER', '<a><b><strong><i><br><p><ul><ol><li>'); // für textfelder (zb. additional_contact)
 
 define('FILES_DIR', '/files/');
 

diff --git a/config/asset_compress.ini b/config/asset_compress.ini
@@ -12,6 +12,7 @@ paths[] = WEBROOT/node_modules
 cachePath = WEBROOT/cache/
 filters[] = SimpleCssMin
 paths[] = WEBROOT/css
+paths[] = WEBROOT/js
 paths[] = WEBROOT/node_modules
 
 [_base.css]
@@ -23,6 +24,9 @@ files[] = @fortawesome/fontawesome-free/css/all.css
 files[] = frontend.css
 files[] = table.css
 files[] = right.css
+files[] = elfinder/css/elfinder.full.css
+files[] = elfinder/css/theme.css
+files[] = jodit/es2021/jodit.css
 files[] = featherlight/src/featherlight.css
 files[] = featherlight/src/featherlight.gallery.css
 files[] = jQuery-Impromptu/dist/jquery-impromptu.css
@@ -62,6 +66,10 @@ files[] = speakingurl/lib/speakingurl.js
 files[] = jquery-slugify/dist/slugify.js
 files[] = select2/dist/js/select2.full.js
 files[] = select2/dist/js/i18n/de.js
+files[] = elfinder/js/elfinder.min.js
+files[] = jodit/es2021/jodit.js
+files[] = editor.js
+files[] = modal-elfinder.js
 files[] = detect.js
 files[] = clipboard/dist/clipboard.js
 files[] = helper.js

diff --git a/config/elfinder/elfinder.html b/config/elfinder/elfinder.html
diff --git a/devtools/npm-post-install.sh b/devtools/npm-post-install.sh
@@ -12,5 +12,4 @@ cp -R $APP/webroot/node_modules/@fortawesome/fontawesome-free/webfonts $APP/webr
 cp -R $APP/webroot/node_modules/jquery-ui/dist/themes/smoothness/images $APP/webroot/cache
 cp -R $APP/webroot/node_modules/leaflet/dist/images $APP/webroot/cache
 
-cp $APP/config/elfinder/elfinder.html $APP/webroot/js/elfinder/elfinder.html
 cp $APP/config/elfinder/php/connector.minimal.php $APP/webroot/js/elfinder/php/connector.minimal.php
diff --git a/plugins/Admin/templates/Knowledges/edit.php b/plugins/Admin/templates/Knowledges/edit.php
@@ -62,9 +62,9 @@
     <?php
         echo $this->element('cancelAndSaveButton');
     ?>
-    <div class="ckeditor-edit">
+    <div class="editor-edit">
       <?php
-        echo $this->element('ckeditorEdit', [
+        echo $this->element('editorEdit', [
            'value' => $knowledge->text,
            'name' => 'Knowledges.text',
            'uid' => $uid,
@@ -80,4 +80,4 @@
 
 </div>
 
-<div class="sc"></div> <?php /* wegen ckeditor */ ?>
+<div class="sc"></div> <?php /* wegen editor */ ?>
diff --git a/plugins/Admin/templates/Pages/edit.php b/plugins/Admin/templates/Pages/edit.php
@@ -56,9 +56,9 @@
         echo $this->element('cancelAndSaveButton');
     ?>
 
-    <div class="ckeditor-edit">
+    <div class="editor-edit">
         <?php
-            echo $this->element('ckeditorEdit', [
+            echo $this->element('editorEdit', [
               'value' => $page->text,
               'name' => 'Pages.text',
               'uid' => $uid,
@@ -75,4 +75,4 @@
 
 </div>
 
-<div class="sc"></div> <?php /* wegen ckeditor */ ?>
+<div class="sc"></div> <?php /* wegen editor */ ?>
diff --git a/plugins/Admin/templates/Posts/edit.php b/plugins/Admin/templates/Posts/edit.php
@@ -68,9 +68,9 @@
     <?php
         echo $this->element('cancelAndSaveButton');
     ?>
-    <div class="ckeditor-edit">
+    <div class="editor-edit">
       <?php
-        echo $this->element('ckeditorEdit', [
+        echo $this->element('editorEdit', [
            'value' => $post->text,
            'name' => 'Posts.text',
            'uid' => $uid,
@@ -87,4 +87,4 @@
 
 </div>
 
-<div class="sc"></div> <?php /* wegen ckeditor */ ?>
+<div class="sc"></div> <?php /* wegen editor */ ?>
diff --git a/plugins/Admin/templates/layout/default.php b/plugins/Admin/templates/layout/default.php
@@ -69,9 +69,6 @@
   <?php
     echo $this->AssetCompress->script('_admin', array('raw' => Configure::read('debug')));
 
-    echo $this->Html->script('/node_modules/ckeditor4/ckeditor.js?v4.19.0');
-    echo $this->Html->script('/node_modules/ckeditor4/adapters/jquery.js?v4.19.0');
-
     echo $this->Html->scriptBlock(
         $this->Html->wrapJavascriptBlock(
             JS_NAMESPACE.".Admin.init();"

diff --git a/src/Controller/AppController.php b/src/Controller/AppController.php
@@ -287,10 +287,10 @@ protected function stripTagsFromFields($entity, $modelName)
                     $entity->$field = strip_tags($data, ALLOWED_TAGS_USER);
                 }
             } else if ($field == 'text') {
-                // ckeditor feld heißt normalerweise 'text'
-                $allowedTags = ALLOWED_TAGS_CKEDITOR_USER;
+                // editor feld heißt normalerweise 'text'
+                $allowedTags = ALLOWED_TAGS_EDITOR_USER;
                 if ($this->isAdmin() && in_array($modelName, ['Post', 'Page', 'Knowledge'])) {
-                    $allowedTags =  ALLOWED_TAGS_CKEDITOR_ADMIN;
+                    $allowedTags =  ALLOWED_TAGS_EDITOR_ADMIN;
                 }
                 if (!is_null($data)) {
                     $entity->$field = strip_tags($data, $allowedTags);

diff --git a/templates/Workshops/edit.php b/templates/Workshops/edit.php
@@ -114,9 +114,9 @@
     </div>
 
 
-    <div class="ckeditor-edit">
+    <div class="editor-edit">
       <?php
-        echo $this->element('ckeditorEdit', [
+        echo $this->element('editorEdit', [
             'value' => $workshop->text,
             'name' => 'Workshops.text',
             'uid' => $workshop->uid,
@@ -141,4 +141,4 @@
 
 </div>
 
-<div class="sc"></div> <?php /* wegen ckeditor */ ?>
+<div class="sc"></div> <?php /* wegen editor */ ?>
diff --git a/templates/element/ckeditorEdit.php → templates/element/editorEdit.php b/templates/element/ckeditorEdit.php → templates/element/editorEdit.php
@@ -6,18 +6,18 @@
 if ($uid === null) {
     echo '<p style="margin-bottom: 10px;clear: both;">Um Bilder und Dateien hochzuladen, bitte zuerst speichern.</p>';
     $this->element('addScript', ['script' =>
-        JS_NAMESPACE . ".Helper.initCkeditorWithoutElfinder('".$convertedName."', ".$this->request->getSession()->read('isMobile').");"
+        JS_NAMESPACE . ".Editor.init('".$convertedName."', ".$this->request->getSession()->read('isMobile').");"
     ]);
 } else {
     $this->element('addScript', ['script' =>
-        JS_NAMESPACE . ".Helper.initCkeditor('".$convertedName."', ".$this->request->getSession()->read('isMobile').");"
+        JS_NAMESPACE . ".Editor.initWithUpload('".$convertedName."', ".$this->request->getSession()->read('isMobile').");"
     ]);
 }
 
 if (isset($objectType) && isset($uid)) {
     $_SESSION['ELFINDER'] = [];
     $_SESSION['ELFINDER']['uploadUrl'] = "/files/kcfinder/".$objectType."/".$uid;
-    $uploadDir = str_replace('//', '/', $_SERVER['DOCUMENT_ROOT']."files/kcfinder/".$objectType."/".$uid);
+    $uploadDir = str_replace('//', '/', $_SERVER['DOCUMENT_ROOT']."/files/kcfinder/".$objectType."/".$uid);
     $_SESSION['ELFINDER']['uploadPath'] = $uploadDir;
 }
 
@@ -27,7 +27,6 @@
         'value' => $value,
         'label' => '',
         'style' => 'width:610px;',
-        'class' => 'ckeditor'
     ]
 );
 

diff --git a/templates/element/post.php b/templates/element/post.php
@@ -81,7 +81,7 @@
     }
 
 //detail
-echo '<div class="ckeditor-text">';
+echo '<div class="editor-text">';
 
 if ($showImage) {
       if ($type == 'preview') {
@@ -106,7 +106,7 @@
 
 echo '<br /><br />';
 
-echo '</div>'; // .ckeditor-text
+echo '</div>'; // .editor-text
 echo '</div>'; // .image-text-wrapper
 
 echo '</div>'; // .text-wrapper

diff --git a/templates/layout/default.php b/templates/layout/default.php
@@ -119,9 +119,6 @@
 
             echo $this->AssetCompress->script('_frontend' . ($this->request->getSession()->read('isMobile') ? '_mobile' : ''), ['raw' => Configure::read('debug')]);
 
-            echo $this->Html->script('/node_modules/ckeditor4/ckeditor.js?v4.19.0');
-            echo $this->Html->script('/node_modules/ckeditor4/adapters/jquery.js?v4.19.0');
-
             // add script BEFORE all scripts that are loaded in views (block)
             echo $this->Html->scriptBlock(
                 $this->Html->wrapJavascriptBlock(