From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop
---
program/js/tiny_mce/plugins/legacyoutput/editor_plugin_src.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/program/js/tiny_mce/plugins/legacyoutput/editor_plugin_src.js b/program/js/tiny_mce/plugins/legacyoutput/editor_plugin_src.js
index e627ec7..3cdcde5 100644
--- a/program/js/tiny_mce/plugins/legacyoutput/editor_plugin_src.js
+++ b/program/js/tiny_mce/plugins/legacyoutput/editor_plugin_src.js
@@ -68,7 +68,7 @@
},
// Setup font elements for colors as well
- forecolor : {inline : 'font', styles : {color : '%value'}},
+ forecolor : {inline : 'font', attributes : {color : '%value'}},
hilitecolor : {inline : 'font', styles : {backgroundColor : '%value'}}
});
--
Gitblit v1.9.1