From a228d8ad698022e9c027d2892116896e04b41336 Mon Sep 17 00:00:00 2001
From: Henning Leutz <leutz@pcsg.de>
Date: Sat, 28 Mar 2020 08:34:53 +0100
Subject: [PATCH] fix: dont kill font awesome icons
---
bin/Editor.js | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/bin/Editor.js b/bin/Editor.js
index 470d744..c5fb9d3 100644
--- a/bin/Editor.js
+++ b/bin/Editor.js
@@ -256,7 +256,7 @@ define('package/quiqqer/ckeditor4/bin/Editor', [
width : width,
toolbar : toolbar,
allowedContent : true,
- extraAllowedContent : 'div(*)[*]{*}; iframe(*)[*]{*}; img(*)[*]{*}; script(*)[*]{*}; ins(*)[*]{*}',
+ extraAllowedContent : 'iframe(*)[*]{*}; img(*)[*]{*}; script(*)[*]{*}; ins(*)[*]{*}',
protectedSource : [/<ins[\s|\S]+?<\/ins>/g],
stylesSet : styles,
contentsCss : data.cssFiles || [],
@@ -269,6 +269,10 @@ define('package/quiqqer/ckeditor4/bin/Editor', [
autoGrow_onStartup : false,
resize_enabled : false
});
+
+ // because of font awesome
+ window.CKEDITOR.dtd.$removeEmpty.span = false;
+ window.CKEDITOR.dtd.$removeEmpty.i = false;
});
},
@@ -1027,8 +1031,8 @@ define('package/quiqqer/ckeditor4/bin/Editor', [
*
* @return boolean
*/
- $turnLinkRelInputToSelect: function(DialogDefinition) {
- var AdvancedTab = DialogDefinition.getContents("advanced");
+ $turnLinkRelInputToSelect: function (DialogDefinition) {
+ var AdvancedTab = DialogDefinition.getContents("advanced");
if (!AdvancedTab) {
return false;
@@ -1041,7 +1045,7 @@ define('package/quiqqer/ckeditor4/bin/Editor', [
}
if (RelationInput) {
- RelationInput.type = 'select';
+ RelationInput.type = 'select';
RelationInput.items = [
['alternate'],
['author'],
--
GitLab