Merge branch 'master' into dev10

This commit is contained in:
Fred Tempez 2020-03-15 17:11:07 +01:00
commit 0caaa2c10e

View File

@ -20,7 +20,7 @@ tinymce.init({
// Plugins // Plugins
plugins: "advlist anchor autolink autoresize autosave codemirror colorpicker contextmenu fullscreen hr image imagetools link lists media paste searchreplace stickytoolbar tabfocus table template textcolor codesample", plugins: "advlist anchor autolink autoresize autosave codemirror colorpicker contextmenu fullscreen hr image imagetools link lists media paste searchreplace stickytoolbar tabfocus table template textcolor codesample",
// Contenu de la barre d'outils // Contenu de la barre d'outils
toolbar: "restoredraft | undo redo | bold italic underline forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist | template | image media link | fullscreen", toolbar: "restoredraft | undo redo | bold italic underline forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist | template code | image media link | fullscreen",
// CodeMirror // CodeMirror
codemirror: { codemirror: {
indentOnInit: true, // Whether or not to indent code on init. indentOnInit: true, // Whether or not to indent code on init.