Fix conflicts, clean the code, add migration from old mediatags

2018-04-20 17:49:40 +02:00
parent 6a4f25bc9f
commit 41afc28802
2 changed files with 48 additions and 72 deletions
--- a/customize.dist/ckeditor-config.js
+++ b/customize.dist/ckeditor-config.js
@@ -5,7 +5,6 @@ CKEDITOR.editorConfig = function( config ) {
    config.needsBrFiller= fixThings;
    config.needsNbspFiller= fixThings;

-    config.allowedContent = 'media-tag[*]';
    config.removeButtons= 'Source,Maximize,Anchor';
    // magicline plugin inserts html crap into the document which is not part of the
    // document itself and causes problems when it's sent across the wire and reflected back