Commit 6c69ce27 authored by Richard Mansfield's avatar Richard Mansfield Committed by Gerrit Code Review
Browse files

Merge "Add undo/redo buttons to TinyMCE (bug #548000)"

parents f0287e08 95c200e2
...@@ -106,9 +106,9 @@ function smarty($javascript = array(), $headers = array(), $pagestrings = array( ...@@ -106,9 +106,9 @@ function smarty($javascript = array(), $headers = array(), $pagestrings = array(
$extrasetup = isset($extraconfig['tinymcesetup']) ? $extraconfig['tinymcesetup'] : ''; $extrasetup = isset($extraconfig['tinymcesetup']) ? $extraconfig['tinymcesetup'] : '';
$adv_buttons = array( $adv_buttons = array(
"bold,italic,underline,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,bullist,numlist,separator,link,unlink,separator,code,fullscreen", "undo,redo,separator,bold,italic,underline,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,bullist,numlist,separator,link,unlink,separator,code,fullscreen",
"bold,italic,underline,strikethrough,separator,forecolor,backcolor,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,hr,emotions,image,spellchecker,cleanup,separator,link,unlink,separator,code", "bold,italic,underline,strikethrough,separator,forecolor,backcolor,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,hr,emotions,image,spellchecker,cleanup,separator,link,unlink,separator,code",
"bullist,numlist,separator,tablecontrols,separator,cut,copy,paste,pasteword", "undo,redo,separator,bullist,numlist,separator,tablecontrols,separator,cut,copy,paste,pasteword",
"fontselect,separator,fontsizeselect,separator,formatselect", "fontselect,separator,fontsizeselect,separator,formatselect",
); );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment