Commit 099b3d31 authored by Liam's avatar Liam

Bug #1446400: Add anchor button to tinymce

behatnotneeded

Change-Id: I6f2b26e6bb9e839e8c3ccaddef6fdfc916b3bdd9
parent afaf0bd8
......@@ -16,6 +16,7 @@ Changes:
* Adding the 'aria-hidden="true"' to presentation icons (original commit: 4ac89c31a719a9f63be6555c4d1a094fd2b09d0e)
* Bug 1605110: Modified the "table" plugin to style the table through CSS instead of HTML attributes (original commit: 63f91a7ea8bd60c102e257c05678cc6d55e21683)
* Add TinyMCE imagebrowser plugin: plugins/imagebrowser/plugin.js
* Modified plugins/link/plugin.js to add 'user_' to the anchorlist value and selected to account for htmlpurification prefixing all user id's with 'user_'
* Removed
plugins/layer removed in v4.5.0
plugins/media/moxieplayer.swf removed in v4.5.0
......
......@@ -199,8 +199,8 @@ tinymce.PluginManager.add('link', function(editor) {
if (id) {
anchorList.push({
text: id,
value: '#' + id,
selected: url.indexOf('#' + id) != -1
value: '#user_' + id,
selected: url.indexOf('#user_' + id) != -1
});
}
});
......
......@@ -276,7 +276,7 @@ function smarty($javascript = array(), $headers = array(), $pagestrings = array(
null,
'"toolbar_toggle | formatselect | bold italic | bullist numlist | link unlink | imagebrowser | undo redo"',
'"underline strikethrough subscript superscript | alignleft aligncenter alignright alignjustify | outdent indent | forecolor backcolor | ltr rtl | fullscreen"',
'"fontselect | fontsizeselect | emoticons nonbreaking charmap ' . $mathslate . ' ' . $spellchecker_toolbar . ' | table | removeformat pastetext | code"',
'"fontselect | fontsizeselect | emoticons nonbreaking charmap ' . $mathslate . ' ' . $spellchecker_toolbar . ' | table | removeformat pastetext | anchor | code"',
);
// For right-to-left langs, reverse button order & align controls right.
......@@ -301,7 +301,7 @@ EOF;
if ($check[$key] == 'tinymce') {
$tinymceconfig = <<<EOF
theme: "modern",
plugins: "tooltoggle,textcolor,visualblocks,wordcount,link,lists,imagebrowser,table,emoticons{$spellchecker},paste,code,fullscreen,directionality,searchreplace,nonbreaking,charmap{$mathslateplugin}",
plugins: "tooltoggle,textcolor,visualblocks,wordcount,link,lists,imagebrowser,table,emoticons{$spellchecker},paste,code,fullscreen,directionality,searchreplace,nonbreaking,charmap{$mathslateplugin},anchor",
skin: 'light',
toolbar1: {$toolbar[1]},
toolbar2: {$toolbar[2]},
......
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