Merge pull request #1397 from Marc-pi/develop

Ckeditor : update allowed classes and tag per discussion for Bootstrap & FA (partially covers #1320)
pi-engine · Jan 6, 2016 · 024032f · 024032f
2 parents 8c2e86e + 37fe9e2
commit 024032f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/www/script/editor/ckeditor/config.js b/www/script/editor/ckeditor/config.js
@@ -33,8 +33,10 @@ CKEDITOR.editorConfig = function( config ) {
     // Set the most common block elements.
     config.format_tags = 'p;h1;h2;h3;pre';
 
-	// Allow all div classes (from theme)
-    config.extraAllowedContent = 'div(*)';
+	// Allow all div classes (from theme and for Boostrap and FontAwesome), allow empty <i>
+    config.extraAllowedContent = 'div(*)[*]{*}; a[!href]; span(*)[*]{*};table(*)[*]{*}; p(*)[*]{*}; li(*)[*]{*}; ul(*)[*]{*}; img(*)[*]{*}';
+	CKEDITOR.dtd.$removeEmpty.i = 0;
+	CKEDITOR.dtd.$removeEmpty.span = 0;
 
     // Simplify the dialog windows.
     config.removeDialogTabs = 'image:advanced;link:advanced';