Make sure signature compose config doesn't overwrite existing config

horde · Jan 7, 2015 · 789ee9e · 789ee9e
1 parent 55b6eb9
commit 789ee9e
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/imp/js/compose.js b/imp/js/compose.js
@@ -186,8 +186,13 @@ var ImpCompose = {
                 this.rte_sig.setData($F('signature'));
             } else {
                 config = Object.clone(IMP.ckeditor_config);
-                config.removePlugins = 'toolbar,elementspath';
-                config.contentsCss = [ CKEDITOR.basePath + 'contents.css', CKEDITOR.basePath + 'nomargin.css' ];
+                config.removePlugins = (config.removePlugins || '')
+                    .split(',')
+                    .concat('toolbar', 'elementspath')
+                    .join(',');
+                config.contentsCss = [ config.contentsCss]
+                    .concat(CKEDITOR.basePath + 'contents.css', CKEDITOR.basePath + 'nomargin.css')
+                    .flatten();
                 config.height = ($('signatureBorder') ? $('signatureBorder') : $('signature')).getLayout().get('height');
                 this.rte_sig = new IMP_Editor('signature', config);
             }