Enables CKeditior html elements (#2780)

Author: oliverfoster

frontend/src/modules/scaffold/backboneFormsOverrides.js

@@ -84,13 +84,31 @@ define([
       };
     }
 
+    function convertStringsToRegExDeep (arr) {
+      function processEntry ([key, value]) {
+        value = (typeof value === "string")
+          ? new RegExp(value, 'i')
+          : Array.isArray(value)
+            ? arr.map((value, index) => processEntry([index, value])[1])
+            : (typeof value === "object" && value !== null)
+              ? Object.fromEntries(Object.entries(value).map(processEntry))
+              : value;
+        return [key, value];
+      }
+      return arr.map((value, index) => processEntry([index, value])[1])
+    }
+
     until(isAttached(this.$el)).then(() => {
       return CKEDITOR.create(this.$el[0], {
         dataIndentationChars: '',
         disableNativeSpellChecker: false,
         enterMode: CKEDITOR[Origin.constants.ckEditorEnterMode],
         entities: false,
-        extraAllowedContent: Origin.constants.ckEditorExtraAllowedContent,
+        htmlSupport: {
+          // Convert all allow/disallow strings to regexp, as config is json only
+          allow: convertStringsToRegExDeep((Origin.constants.ckEditorHtmlSupport && Origin.constants.ckEditorHtmlSupport.allow) || []),
+          disallow: convertStringsToRegExDeep((Origin.constants.ckEditorHtmlSupport && Origin.constants.ckEditorHtmlSupport.disallow) || [])
+        },
         on: {
           change: function() {
             this.trigger('change', this);

lib/configuration.js

@@ -32,7 +32,7 @@ var ALLOWED_CLIENT_SIDE_KEYS = [
   'useSmtp',
   'isProduction',
   'maxLoginAttempts',
-  'ckEditorExtraAllowedContent',
+  'ckEditorHtmlSupport',
   'ckEditorEnterMode',
   'maxFileUploadSize',
   'supportLink',
@@ -81,7 +81,20 @@ function Configuration() {
   this.conf = {
     root: this.serverRoot,
     maxLoginAttempts: 3,
-    ckEditorExtraAllowedContent: 'span(*)',
+    ckEditorHtmlSupport: {
+      allow: [{
+        name: "^(blockquote|ul|ol|span)$"
+      },{
+        name: ".*",
+        classes: true,
+        styles: true
+      },{
+        name: "^a$",
+        attributes: {
+          target: true
+        }
+      }]
+    },
     maxFileUploadSize: '200MB',
     ckEditorEnterMode: 'ENTER_P'
   };

routes/index/index.hbs

@@ -70,6 +70,7 @@
         Code,
         Essentials,
         FindAndReplace,
+        GeneralHtmlSupport,
         Font,
         Highlight,
         Indent,
@@ -115,6 +116,7 @@
         Code,
         Essentials,
         FindAndReplace,
+        GeneralHtmlSupport,
         Font,
         Highlight,
         Indent,