diff options
| author | Brett Profitt <brett.profitt@gmail.com> | 2013-02-21 13:34:49 -0800 |
|---|---|---|
| committer | Brett Profitt <brett.profitt@gmail.com> | 2013-02-21 13:34:49 -0800 |
| commit | 556b3f68be6d568e1ab19a6e02a073da8f49ea38 (patch) | |
| tree | 4d5b09112ec2199ae9008109ba97e1478b915a21 /mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js | |
| parent | 88b7f8a3a32542e8b016c2163f44e1ebce7211fc (diff) | |
| parent | 4cd91acc35bd1923b9c2bfd5c377c0ac2e157d23 (diff) | |
| download | elgg-556b3f68be6d568e1ab19a6e02a073da8f49ea38.tar.gz elgg-556b3f68be6d568e1ab19a6e02a073da8f49ea38.tar.bz2 | |
Merge pull request #5095 from iionly/tinymce_update_3_5_8
Tinymce plugin: update to version 3.5.8 of Tinymce editor
Diffstat (limited to 'mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js')
| -rw-r--r-- | mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js index e627ec76e..3cdcde579 100644 --- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js +++ b/mod/tinymce/vendor/tinymce/jscripts/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'}}
});
|