diff --git a/assets/src/js/functions/textarea.js b/assets/src/js/functions/textarea.js index 6220566e8..9f9bad4c8 100644 --- a/assets/src/js/functions/textarea.js +++ b/assets/src/js/functions/textarea.js @@ -101,7 +101,7 @@ function initCKEditor(input) { disableNativeSpellChecker: false, fullPage: (input.hasAttribute('use_full_ckeditor')) ? true : false, allowedContent: (input.hasAttribute('use_full_ckeditor')) ? true : false, - extraPlugins: 'scayt,ckeditor-image-to-base64', + extraPlugins: 'scayt,textwatcher,autocomplete,textmatch,emoji', skin: 'moono-lisa', }); diff --git a/gulpfile.js b/gulpfile.js index 3c0d6e6f0..a31d6d199 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -281,11 +281,25 @@ function srcFonts() { } function ckeditor() { - return gulp.src([ + + const ckeditor = gulp.src([ config.nodeDirectory + '/ckeditor4/{adapters,lang,skins,plugins,core}/**/*.{js,json,css,png,gif,html}', config.nodeDirectory + '/ckeditor4/*.{js,css}', ]) .pipe(gulp.dest(config.production + '/' + config.paths.js + '/ckeditor')); + + const plugins = gulp.src([ + config.nodeDirectory + '/ckeditor/plugins/{emoji,autocomplete,textmatch,textwatcher}/**/*.{js,json,css,png,gif,html}', + config.nodeDirectory + '/ckeditor-image-to-base/*.{js,json,css,png,gif,html}', + ]) + .pipe(gulp.dest(config.production + '/' + config.paths.js + '/ckeditor/plugins')); + + const extra = gulp.src([ + config.nodeDirectory + '/ckeditor-image-to-base/**/*.{js,json,css,png,gif,html}', + ]) + .pipe(gulp.dest(config.production + '/' + config.paths.js + '/ckeditor/plugins/ckeditor-image-to-base64')); + + return merge(ckeditor, plugins, extra); } function colorpicker() { diff --git a/include/top.php b/include/top.php index 24737355b..d14543c43 100755 --- a/include/top.php +++ b/include/top.php @@ -213,7 +213,7 @@ if (Auth::check()) { collapse_plugin_sidebar: '.intval(setting('Nascondere la barra dei plugin di default')).', ckeditorToolbar: [ - ["Undo","Redo","-","Cut","Copy","Paste","PasteText","PasteFromWord","-","SpellChecker", "Scayt", "-","Link","Unlink","-","Bold","Italic","Underline","Superscript","SpecialChar","HorizontalRule","-","JustifyLeft","JustifyCenter","JustifyRight","JustifyBlock","-","NumberedList","BulletedList","Outdent","Indent","Blockquote","-","Styles","Format","Image","Table", "TextColor", "BGColor" ], + ["Undo","Redo","-","Cut","Copy","Paste","PasteText","PasteFromWord","-","SpellChecker", "Scayt", "-","Link","Unlink","-","Bold","Italic","Underline","Superscript","SpecialChar","HorizontalRule","-","JustifyLeft","JustifyCenter","JustifyRight","JustifyBlock","-","NumberedList","BulletedList","Outdent","Indent","Blockquote","-","Styles","Format","Image","Table", "TextColor", "BGColor", "EmojiPanel" ], ], ckeditorToolbar_Full: [ { name: "document", items : [ "Source", "ExportPdf", "Preview", "Print", "-", "Templates" ] }, @@ -226,7 +226,7 @@ if (Auth::check()) { { name: "paragraph", items : [ "NumberedList","BulletedList","-","Outdent","Indent","-","Blockquote","CreateDiv", "-","JustifyLeft","JustifyCenter","JustifyRight","JustifyBlock","-","BidiLtr","BidiRtl","Language" ] }, { name: "links", items : [ "Link","Unlink","Anchor" ] }, - { name: "insert", items : [ "Image","Flash","Table","HorizontalRule","Smiley","SpecialChar","PageBreak","Iframe" ] }, + { name: "insert", items : [ "Image","Flash","Table","HorizontalRule","EmojiPanel","SpecialChar","PageBreak","Iframe" ] }, "/", { name: "styles", items : [ "Styles","Format","Font","FontSize" ] }, { name: "colors", items : [ "TextColor","BGColor" ] }, diff --git a/modules/newsletter/buttons.php b/modules/newsletter/buttons.php index 155b354ff..ca3fff7ee 100755 --- a/modules/newsletter/buttons.php +++ b/modules/newsletter/buttons.php @@ -31,12 +31,6 @@ if ($newsletter->state == 'DEV' && !empty($template)) { // Duplica newsletter echo ' -'; - -echo ' -
- - -
'; +'; \ No newline at end of file diff --git a/package.json b/package.json index 9b860dc62..4e36af256 100755 --- a/package.json +++ b/package.json @@ -12,7 +12,6 @@ "bootstrap-maxlength": "^1.10.1", "chart.js": "^3.8.0", "ckeditor4": "ckeditor/ckeditor-releases#full/latest", - "ckeditor-image-to-base": "^0.0.3", "components-jqueryui": "^1.12.1", "datatables.net-bs": "^1.10.15", "datatables.net-buttons-bs": "^1.3.1",