diff --git a/.eslintrc.js b/.eslintrc.js index 8a102dd5a..50fbb523c 100644 --- 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 index bfb6b0dca..9eca65e04 100644 --- 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', '


  • '); -define('ALLOWED_TAGS_CKEDITOR_ADMIN', ALLOWED_TAGS_CKEDITOR_USER . '