Commit 11c2e411 authored by Rebecca Blundell's avatar Rebecca Blundell
Browse files

Bug 1850578: Add Tinymce mobile theme 

This is required for the editor to show on Android devices

Also hid the image button in the mobile theme as it can't be configured to connect
to our imagebrowser. Tinymce doesn't currently support custom
plugins for the mobile theme. If this changes in future, we
could look at putting it back.

Change-Id: I41f45ffaad1e20b712f59eac7d7e92f00915f394
parent 1babdfd1

htdocs/js/tinymce/README.Mahara

+4 −1
Original line number Diff line number Diff line
@@ -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)

htdocs/js/tinymce/themes/mobile/theme.js

0 → 100644
+13870 −0

File added.

Preview size limit exceeded, changes collapsed.

htdocs/js/tinymce/themes/mobile/theme.min.js

0 → 100644
+9 −0

File added.

Preview size limit exceeded, changes collapsed.

htdocs/lib/web.php

+4 −0
Original line number Diff line number Diff line
@@ -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',