Commit 4f2ac34a authored by Cecilia Vela Gurovic's avatar Cecilia Vela Gurovic Committed by Gerrit Code Review

Merge "Bug 1850578: Add Tinymce mobile theme"

parents ddb5d389 11c2e411
......@@ -19,11 +19,13 @@ Changes:
* Removed
min.js files from main and plugin folders
theme/mobile
skins/ui/oxide-dark
plugins/help
min.js from plugin folders
skins/content
(We used to remove theme/mobile, but this is required for the editor
to display on Android devices) We currently override the buttons displayed
in the mobile toolbar (in lib/web.php) so image is not there, as there is no easy way to configure it to work with our imagebrowser.
* Checked for icon.*presentation to make sure icons with 'role="presentation"' also have 'aria-hidden="true"' in the html (original commit: 4ac89c31a719a9f63be6555c4d1a094fd2b09d0e) (no changes this time - remove comment?)
......@@ -31,3 +33,4 @@ Changes:
* 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_'
(original commit: 099b3d3119a1e9900ab2ea2341470d15f05adbe3)
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -343,6 +343,10 @@ EOF;
if ($check[$key] == 'tinymce') {
$tinymceconfig = <<<EOF
theme: "silver",
mobile: {
theme: 'mobile',
toolbar: ['undo', 'bold', 'italic', 'link', 'bullist', 'styleselect'],
},
contextmenu: false,
plugins: "tooltoggle,visualblocks,wordcount,link,lists,imagebrowser,table,emoticons{$spellchecker},paste,code,fullscreen,directionality,searchreplace,nonbreaking,charmap{$mathslateplugin},anchor",
skin: 'oxide',
......
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