Merge pull request PrestaShop#19776 from NeOMakinG/issue19408

Allow developers to use their own tinymce config
lfymcc · Nov 19, 2020 · d9dcd43 · d9dcd43
2 parents e9624dc + 0046bf5
commit d9dcd43
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/js/admin/tinymce.inc.js b/js/admin/tinymce.inc.js
@@ -49,7 +49,8 @@ function tinySetup(config) {
     selector: '.rte',
     plugins: 'align colorpicker link image filemanager table media placeholder advlist code table autoresize',
     browser_spellcheck: true,
-    toolbar1: 'code,colorpicker,bold,italic,underline,strikethrough,blockquote,link,align,bullist,numlist,table,image,media,formatselect',
+    toolbar1:
+      'code,colorpicker,bold,italic,underline,strikethrough,blockquote,link,align,bullist,numlist,table,image,media,formatselect',
     toolbar2: '',
     external_filemanager_path: baseAdminDir + 'filemanager/',
     filemanager_title: 'File manager',
@@ -71,6 +72,10 @@ function tinySetup(config) {
     rel_list: [{title: 'nofollow', value: 'nofollow'}]
   };
 
+  if (typeof window.defaultTinyMceConfig !== 'undefined') {
+    Object.assign(default_config, window.defaultTinyMceConfig);
+  }
+
   $.each(default_config, function(index, el) {
     if (config[index] === undefined) config[index] = el;
   });