Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Remove textcolor and colorpicker from plugins, they are included in core

Browse Source 
[MAILPOET-1799]
This commit is contained in:
Ján Mikláš
2019-08-27 11:17:06 +02:00
committed by M. Shull
parent b1a66e8077
commit 5bd6abe9d0
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/js/src/newsletter_editor/behaviors/TextEditorBehavior.js
View File

@@ -12,11 +12,9 @@ import tinymceMailpoetShortcodes from 'newsletter_editor/tinymce/mailpoet_shortc
// TinyMCE theme and plugins // TinyMCE theme and plugins
import 'tinymce/themes/modern'; import 'tinymce/themes/modern';
import 'tinymce/plugins/code'; import 'tinymce/plugins/code';
import 'tinymce/plugins/colorpicker';
import 'tinymce/plugins/link'; import 'tinymce/plugins/link';
import 'tinymce/plugins/lists'; import 'tinymce/plugins/lists';
import 'tinymce/plugins/paste'; import 'tinymce/plugins/paste';
import 'tinymce/plugins/textcolor';
var BL = BehaviorsLookup; var BL = BehaviorsLookup;
@@ -28,7 +26,7 @@ BL.TextEditorBehavior = Marionette.Behavior.extend({
validElements: 'p[class|style],span[class|style],a[href|class|title|target|style],strong[class|style],em[class|style],strike,br,del', validElements: 'p[class|style],span[class|style],a[href|class|title|target|style],strong[class|style],em[class|style],strike,br,del',
invalidElements: 'script', invalidElements: 'script',
blockFormats: 'Paragraph=p', blockFormats: 'Paragraph=p',
plugins: 'link textcolor colorpicker mailpoet_shortcodes', plugins: 'link mailpoet_shortcodes',
configurationFilter: function configurationFilter(originalConfig) { return originalConfig; }, configurationFilter: function configurationFilter(originalConfig) { return originalConfig; },
}, },
initialize: function initialize() { initialize: function initialize() {

2
assets/js/src/newsletter_editor/blocks/text.js
View File

@@ -30,7 +30,7 @@ Module.TextBlockView = base.BlockView.extend({
validElements: 'p[class|style],span[class|style],a[href|class|title|target|style],h1[class|style],h2[class|style],h3[class|style],ol[class|style],ul[class|style],li[class|style],strong[class|style],em[class|style],strike,br,blockquote[class|style],table[class|style],tr[class|style],th[class|style],td[class|style],del', validElements: 'p[class|style],span[class|style],a[href|class|title|target|style],h1[class|style],h2[class|style],h3[class|style],ol[class|style],ul[class|style],li[class|style],strong[class|style],em[class|style],strike,br,blockquote[class|style],table[class|style],tr[class|style],th[class|style],td[class|style],del',
invalidElements: 'script', invalidElements: 'script',
blockFormats: 'Heading 1=h1;Heading 2=h2;Heading 3=h3;Paragraph=p', blockFormats: 'Heading 1=h1;Heading 2=h2;Heading 3=h3;Paragraph=p',
plugins: 'link lists code textcolor colorpicker mailpoet_shortcodes paste', plugins: 'link lists code mailpoet_shortcodes paste',
configurationFilter: function configurationFilter(originalSettings) { configurationFilter: function configurationFilter(originalSettings) {
return _.extend({}, originalSettings, { return _.extend({}, originalSettings, {
mailpoet_shortcodes: App.getConfig().get('shortcodes').toJSON(), mailpoet_shortcodes: App.getConfig().get('shortcodes').toJSON(),