From 05e9c136e6b8bdac06ff3421475a633a6b9cbd5b Mon Sep 17 00:00:00 2001 From: Damyon Wiese Date: Fri, 5 Jul 2013 12:04:42 +0800 Subject: [PATCH 1/4] MDL-23646 tinymce: Add plugin to wrap toolbar on small screens --- lib/editor/tinymce/db/upgrade.php | 51 ++++++++++ lib/editor/tinymce/lib.php | 5 +- .../plugins/wrap/lang/en/tinymce_wrap.php | 28 ++++++ lib/editor/tinymce/plugins/wrap/lib.php | 36 +++++++ lib/editor/tinymce/plugins/wrap/pix/icon.png | Bin 0 -> 314 bytes .../plugins/wrap/tinymce/editor_plugin.js | 88 ++++++++++++++++++ .../plugins/wrap/tinymce/img/ed_wrap.gif | Bin 0 -> 180 bytes lib/editor/tinymce/plugins/wrap/version.php | 32 +++++++ lib/editor/tinymce/settings.php | 6 +- lib/editor/tinymce/styles.css | 21 ++++- lib/editor/tinymce/version.php | 2 +- 11 files changed, 261 insertions(+), 8 deletions(-) create mode 100644 lib/editor/tinymce/plugins/wrap/lang/en/tinymce_wrap.php create mode 100644 lib/editor/tinymce/plugins/wrap/lib.php create mode 100644 lib/editor/tinymce/plugins/wrap/pix/icon.png create mode 100644 lib/editor/tinymce/plugins/wrap/tinymce/editor_plugin.js create mode 100644 lib/editor/tinymce/plugins/wrap/tinymce/img/ed_wrap.gif create mode 100644 lib/editor/tinymce/plugins/wrap/version.php diff --git a/lib/editor/tinymce/db/upgrade.php b/lib/editor/tinymce/db/upgrade.php index a53c4731a35..a44bef88c43 100644 --- a/lib/editor/tinymce/db/upgrade.php +++ b/lib/editor/tinymce/db/upgrade.php @@ -69,5 +69,56 @@ fontselect,fontsizeselect,code,search,replace,|,cleanup,removeformat,pastetext,p upgrade_plugin_savepoint(true, 2013061400, 'editor', 'tinymce'); } + if ($oldversion < 2013070500) { + // Insert wrap plugin to nicely wrap the toolbars on small screens. + $oldorder = "formatselect,bold,italic,|,bullist,numlist,|,link,unlink,|,image + +undo,redo,|,underline,strikethrough,sub,sup,|,justifyleft,justifycenter,justifyright,|,outdent,indent,|,forecolor,backcolor,|,ltr,rtl,|,nonbreaking,charmap,table + +fontselect,fontsizeselect,code,search,replace,|,cleanup,removeformat,pastetext,pasteword,|,fullscreen"; + + $neworder = "formatselect,bold,italic,wrap,bullist,numlist,|,link,unlink,|,image + +undo,redo,|,underline,strikethrough,sub,sup,|,justifyleft,justifycenter,justifyright,wrap,outdent,indent,|,forecolor,backcolor,|,ltr,rtl,|,nonbreaking,charmap,table + +fontselect,fontsizeselect,wrap,code,search,replace,|,cleanup,removeformat,pastetext,pasteword,|,fullscreen"; + $currentorder = get_config('editor_tinymce', 'customtoolbar'); + if ($currentorder == $oldorder) { + unset_config('customtoolbar', 'editor_tinymce'); + set_config('customtoolbar', $neworder, 'editor_tinymce'); + } else { + // Simple auto conversion algorithm. + $toolbars = explode($oldorder, "\n"); + $newtoolbars = array(); + foreach ($toolbars as $toolbar) { + $sepcount = substr_count($toolbar, '|'); + + if ($sepcount > 0) { + // We assume the middle separator (rounding down). + $divisionindex = $sepcount / 2; + + $buttons = explode($toolbar, ','); + $index = 0; + foreach ($buttons as $key => $button) { + if ($button === "|") { + if ($index == $divisionindex) { + $buttons[$key] = 'wrap'; + break; + } + } + } + $toolbar = implode($buttons, ','); + } + array_push($newtoolbars, $toolbar); + } + $neworder = implode($newtoolbars, "\n"); + + // Set the new config. + unset_config('customtoolbar', 'editor_tinymce'); + set_config('customtoolbar', $neworder, 'editor_tinymce'); + } + upgrade_plugin_savepoint(true, 2013070500, 'editor', 'tinymce'); + } + return true; } diff --git a/lib/editor/tinymce/lib.php b/lib/editor/tinymce/lib.php index 3f03950ceb3..5bbd665468a 100644 --- a/lib/editor/tinymce/lib.php +++ b/lib/editor/tinymce/lib.php @@ -52,6 +52,9 @@ class tinymce_texteditor extends texteditor { if (check_browser_version('Safari iOS', 534)) { return true; } + if (check_browser_version('WebKit', 534)) { + return true; + } return false; } @@ -155,7 +158,7 @@ class tinymce_texteditor extends texteditor { 'plugins' => 'lists,table,style,layer,advhr,advlink,emotions,inlinepopups,' . 'searchreplace,paste,directionality,fullscreen,nonbreaking,contextmenu,' . 'insertdatetime,save,iespell,preview,print,noneditable,visualchars,' . - 'xhtmlxtras,template,pagebreak', + 'xhtmlxtras,template,pagebreak,wrap', 'gecko_spellcheck' => true, 'theme_advanced_font_sizes' => "1,2,3,4,5,6,7", 'theme_advanced_layout_manager' => "SimpleLayout", diff --git a/lib/editor/tinymce/plugins/wrap/lang/en/tinymce_wrap.php b/lib/editor/tinymce/plugins/wrap/lang/en/tinymce_wrap.php new file mode 100644 index 00000000000..eedf6d09a5a --- /dev/null +++ b/lib/editor/tinymce/plugins/wrap/lang/en/tinymce_wrap.php @@ -0,0 +1,28 @@ +. + +/** + * Strings for 'wrap' plugin. + * + * @package tinymce_wrap + * @copyright 2013 Damyon Wiese + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +$string['pluginname'] = 'Wrap'; + +/* All lang strings used from TinyMCE JavaScript code must be named 'pluginname:stringname', no need to create langs/en_dlg.js */ +$string['moodlewrap:desc'] = 'Wrap'; diff --git a/lib/editor/tinymce/plugins/wrap/lib.php b/lib/editor/tinymce/plugins/wrap/lib.php new file mode 100644 index 00000000000..91586fc0307 --- /dev/null +++ b/lib/editor/tinymce/plugins/wrap/lib.php @@ -0,0 +1,36 @@ +. + +defined('MOODLE_INTERNAL') || die(); + +/** + * Plugin for Moodle 'wrap' button. + * + * @package tinymce_wrap + * @copyright 2013 Damyon Wiese + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +class tinymce_wrap extends editor_tinymce_plugin { + /** @var array list of buttons defined by this plugin */ + protected $buttons = array('wrap'); + + protected function update_init_params(array &$params, context $context, + array $options = null) { + + // Add JS file, which uses default name. + $this->add_js_plugin($params); + } +} diff --git a/lib/editor/tinymce/plugins/wrap/pix/icon.png b/lib/editor/tinymce/plugins/wrap/pix/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3f21ab4b4ea0c88d879f8dcc8269f2616dacddbf GIT binary patch literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|&H|6fVg?3oVGw3ym^DWNDEP+H z#WBP}@abejzGed+SL3n=LUUSX3V*eVVd0b8s);)6&wn4~ z^z-^}nljI|%`xS+%Dk9wu_>{v@{i@8_wN(WlxlVrEQpStwqAkd(n{N_YNlEY&kSv5 z<>>6?70V5am=q`#S$CxAV-uPL?t-Z`fCNNq)Yc-kzStp-dfF8+ep9 zUa&gZthb>>FGRRsQej#N9qHbs_2|AGRfw=7>^9cJGe^&$UNT*}KULDDg4sz84;c)I$z JtaD0e0surlbg=*c literal 0 HcmV?d00001 diff --git a/lib/editor/tinymce/plugins/wrap/tinymce/editor_plugin.js b/lib/editor/tinymce/plugins/wrap/tinymce/editor_plugin.js new file mode 100644 index 00000000000..95df13ae1d2 --- /dev/null +++ b/lib/editor/tinymce/plugins/wrap/tinymce/editor_plugin.js @@ -0,0 +1,88 @@ +// This file is part of Moodle - http://moodle.org/ +// +// Moodle is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Moodle is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Moodle. If not, see . + +/** + * Plugin for Moodle 'wrap' button. + * + * @package tinymce_wrap + * @copyright 2013 Damyon Wiese + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +(function() { + tinymce.create('tinymce.ui.Wrap:tinymce.ui.Control', { + /** + * Constructor for the tinymce.Wrap class. + */ + Wrap : function(id, s) { + this.parent(id, s); + this.groupEndClass = 'mceToolbarEnd'; + this.groupStartClass = 'mceToolbarStart'; + this.wrapClass = 'mceWrap'; + this.setDisabled(true); + }, + + /** + * Returns the HTML for this control. This control actually ends the current td + * container and opens a new one so that the containers can be styled with CSS + * to wrap at certain screen widths. + * @return string HTML + */ + renderHTML : function() { + var separator = tinymce.DOM.createHTML('span', {role : 'separator', + 'aria-orientation' : 'vertical', + tabindex : '-1'}); + return '' + + '' + separator + '' + + '' + separator + ''; + }, + + + }); + + tinymce.create('tinymce.plugins.wrapPlugin', { + /** + * Returns a new instance of this control, in this case a custom Wrap class. + * + * @param string name - The name of the control to create. Return false if we can't create this control type. + * @param tinymce.ControlManager cc - Tinymce control manager class. + * @return mixed - false or the new control + */ + createControl : function(name, cc) { + if (name === "wrap" || name === "!") { + return new tinymce.ui.Wrap(); + } + return false; + }, + + /** + * Returns information about the plugin as a name/value array. + * The current keys are longname, author, authorurl, infourl and version. + * + * @return {Object} Name/value array containing information about the plugin. + */ + getInfo : function() { + return { + longname : 'wrap plugin', + author : 'Damyon Wiese', + authorurl : 'http://moodle.com/hq', + infourl : 'http://docs.moodle.org/en/TinyMCE', + version : "1.0" + }; + } + }); + + // Register plugin. + tinymce.PluginManager.add('wrap', tinymce.plugins.wrapPlugin); +})(); diff --git a/lib/editor/tinymce/plugins/wrap/tinymce/img/ed_wrap.gif b/lib/editor/tinymce/plugins/wrap/tinymce/img/ed_wrap.gif new file mode 100644 index 0000000000000000000000000000000000000000..1eea21982b6f8c9385d35e24544f78188f38a2c7 GIT binary patch literal 180 zcmV;l089TzNk%w1VG;lm0P_z300008002J#0CyoFzyJXA0093C4C_fr|Dd4%y}kd+ z%KzHh|L5ob@9+Qj_y7O@A^8La000jFEC2ui01^Na06+v`@X1Ll1rOt7$~jtQjpTF~ z$b=kAsTf8pA&6Yw681PpK?sIJBX^lJI)Wa`p{qC+4xIF+Knx`gM$`fT2z-pkSI{kH i00BZ_P1d<{-S7JMo^$~N&m)j82uKJhQ-g#Q5db^X8%90= literal 0 HcmV?d00001 diff --git a/lib/editor/tinymce/plugins/wrap/version.php b/lib/editor/tinymce/plugins/wrap/version.php new file mode 100644 index 00000000000..e1eb2a1719e --- /dev/null +++ b/lib/editor/tinymce/plugins/wrap/version.php @@ -0,0 +1,32 @@ +. + +/** + * TinyMCE toolbar wrapping break + * + * @package tinymce_wrap + * @copyright 2013 Damyon Wiese + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +defined('MOODLE_INTERNAL') || die(); + +// The current plugin version (Date: YYYYMMDDXX). +$plugin->version = 2013061900; +// Required Moodle version. +$plugin->requires = 2013050100; +// Full name of the plugin (used for diagnostics). +$plugin->component = 'tinymce_wrap'; diff --git a/lib/editor/tinymce/settings.php b/lib/editor/tinymce/settings.php index 7dfd681abeb..9865fdfcf57 100644 --- a/lib/editor/tinymce/settings.php +++ b/lib/editor/tinymce/settings.php @@ -31,11 +31,11 @@ if ($ADMIN->fulltree) { require_once(__DIR__.'/adminlib.php'); $settings->add(new tiynce_subplugins_settings()); $settings->add(new admin_setting_heading('tinymcegeneralheader', new lang_string('settings'), '')); - $default = "formatselect,bold,italic,|,bullist,numlist,|,link,unlink,|,image + $default = "formatselect,bold,italic,wrap,bullist,numlist,|,link,unlink,|,image -undo,redo,|,underline,strikethrough,sub,sup,|,justifyleft,justifycenter,justifyright,|,outdent,indent,|,forecolor,backcolor,|,ltr,rtl,|,nonbreaking,charmap,table +undo,redo,|,underline,strikethrough,sub,sup,|,justifyleft,justifycenter,justifyright,wrap,outdent,indent,|,forecolor,backcolor,|,ltr,rtl,|,nonbreaking,charmap,table -fontselect,fontsizeselect,code,search,replace,|,cleanup,removeformat,pastetext,pasteword,|,fullscreen"; +fontselect,fontsizeselect,wrap,code,search,replace,|,cleanup,removeformat,pastetext,pasteword,|,fullscreen"; $settings->add(new admin_setting_configtextarea('editor_tinymce/customtoolbar', get_string('customtoolbar', 'editor_tinymce'), get_string('customtoolbar_desc', 'editor_tinymce', 'http://www.tinymce.com/wiki.php/Buttons/controls'), $default, PARAM_RAW, 100, 8)); $settings->add(new admin_setting_configtextarea('editor_tinymce/fontselectlist', diff --git a/lib/editor/tinymce/styles.css b/lib/editor/tinymce/styles.css index 51d8a92eaa2..b0708bb72ff 100644 --- a/lib/editor/tinymce/styles.css +++ b/lib/editor/tinymce/styles.css @@ -13,7 +13,22 @@ color: red; cursor: pointer; } -.mform .felement.feditor .mceStatusbar, -.mform .felement.feditor iframe { - min-width: 35em; + +@media (max-width: 480px) { + .mceToolbar td { + float: left; + display: inline-block; + } + .mceToolbar .mceWrap { + clear: left; + } + + .o2k7Skin tr.mceLast .mceToolbar tr td.mceWrap, + .o2k7Skin tr.mceFirst .mceToolbar tr td.mceWrap { + margin-left: -3px; + } + .dir-rtl .o2k7Skin tr.mceLast .mceToolbar tr td.mceWrap, + .dir-rtl .o2k7Skin tr.mceFirst .mceToolbar tr td.mceWrap { + margin-left: 0px; + } } diff --git a/lib/editor/tinymce/version.php b/lib/editor/tinymce/version.php index 03363825c63..d5e0240d78c 100644 --- a/lib/editor/tinymce/version.php +++ b/lib/editor/tinymce/version.php @@ -24,7 +24,7 @@ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2013061400; // The current plugin version (Date: YYYYMMDDXX) +$plugin->version = 2013070500; // The current plugin version (Date: YYYYMMDDXX) $plugin->requires = 2013050100; // Requires this Moodle version $plugin->component = 'editor_tinymce'; // Full name of the plugin (used for diagnostics) $plugin->release = '3.5.8'; // This is NOT a directory name, see lib.php if you need to know where is the editor code! From 650a44fc268ea61332ea5dc674fb3efdb0dd1260 Mon Sep 17 00:00:00 2001 From: Damyon Wiese Date: Fri, 5 Jul 2013 13:52:59 +0800 Subject: [PATCH 2/4] MDL-23646 tinymce: Add upgrade algorithm for custom toolbars. --- lib/editor/tinymce/db/upgrade.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/editor/tinymce/db/upgrade.php b/lib/editor/tinymce/db/upgrade.php index a44bef88c43..8487e9cf972 100644 --- a/lib/editor/tinymce/db/upgrade.php +++ b/lib/editor/tinymce/db/upgrade.php @@ -88,30 +88,32 @@ fontselect,fontsizeselect,wrap,code,search,replace,|,cleanup,removeformat,pastet set_config('customtoolbar', $neworder, 'editor_tinymce'); } else { // Simple auto conversion algorithm. - $toolbars = explode($oldorder, "\n"); + $toolbars = explode("\n", $oldorder); $newtoolbars = array(); foreach ($toolbars as $toolbar) { $sepcount = substr_count($toolbar, '|'); if ($sepcount > 0) { // We assume the middle separator (rounding down). - $divisionindex = $sepcount / 2; + $divisionindex = round($sepcount / 2, 0, PHP_ROUND_HALF_DOWN); - $buttons = explode($toolbar, ','); + $buttons = explode(',', $toolbar); $index = 0; foreach ($buttons as $key => $button) { if ($button === "|") { if ($index == $divisionindex) { $buttons[$key] = 'wrap'; break; + } else { + $index += 1; } } } - $toolbar = implode($buttons, ','); + $toolbar = implode(',', $buttons); } array_push($newtoolbars, $toolbar); } - $neworder = implode($newtoolbars, "\n"); + $neworder = implode("\n", $newtoolbars); // Set the new config. unset_config('customtoolbar', 'editor_tinymce'); From 46a24596b8157766dbe787efc36298e6587f867a Mon Sep 17 00:00:00 2001 From: Damyon Wiese Date: Fri, 5 Jul 2013 13:54:38 +0800 Subject: [PATCH 3/4] MDL-23646 tinymce: Fix for pdw plugin This plugin was changing the display of the toolbar tables from "display: table" to "display: block" when hiding/unhiding the toolbars. This broke the wrapping plugin. --- lib/editor/tinymce/plugins/pdw/readme_moodle.txt | 2 ++ .../tinymce/plugins/pdw/tinymce/editor_plugin.js | 5 +---- .../plugins/pdw/tinymce/editor_plugin_src.js | 14 ++++++++++---- lib/editor/tinymce/plugins/pdw/version.php | 2 +- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/lib/editor/tinymce/plugins/pdw/readme_moodle.txt b/lib/editor/tinymce/plugins/pdw/readme_moodle.txt index 2466e1e9b39..0f510fffd88 100644 --- a/lib/editor/tinymce/plugins/pdw/readme_moodle.txt +++ b/lib/editor/tinymce/plugins/pdw/readme_moodle.txt @@ -11,3 +11,5 @@ Upgrade procedure: 1/ extract standard PDW package into lib/editor/tinymce/plugins/pdw/tinymce/ 2/ bump up version.php 3/ update lib/thirdpartylibs.xml +4/ reimplement patch in MDL-23646 +5/ reminify the js manually (I used uglifyjs) diff --git a/lib/editor/tinymce/plugins/pdw/tinymce/editor_plugin.js b/lib/editor/tinymce/plugins/pdw/tinymce/editor_plugin.js index 321ccc2c2da..3646b35abf7 100644 --- a/lib/editor/tinymce/plugins/pdw/tinymce/editor_plugin.js +++ b/lib/editor/tinymce/plugins/pdw/tinymce/editor_plugin.js @@ -22,7 +22,4 @@ * THE SOFTWARE. * Based on TinyMCE Wordpress plugin (Kitchen Sink) */ -(function(){var d=tinymce.DOM;tinymce.PluginManager.requireLangPack("pdw");tinymce.create("tinymce.plugins.pdw",{init:function(a,h){var e=this,i=[],j=[],c;j=a.settings.pdw_toggle_toolbars.split(",");for(c=0;cversion = 2013061400; +$plugin->version = 2013070500; // Required Moodle version. $plugin->requires = 2013050100; // Full name of the plugin (used for diagnostics). From b9bca41b536aea290dad4a95a7ea523b5e6630c1 Mon Sep 17 00:00:00 2001 From: Damyon Wiese Date: Tue, 9 Jul 2013 13:02:04 +0800 Subject: [PATCH 4/4] MDL-23646: Tinymce wrap plugin fixes. Added info to upgrade.txt Removed wrap plugins from the tinymce plugin list. Fix trailing comma in wrap plugin javascript. Removed non functioning "!" handling. Fixed icons for wrap plugin. --- lib/editor/tinymce/lib.php | 2 +- lib/editor/tinymce/plugins/wrap/pix/icon.png | Bin 314 -> 0 bytes .../tinymce/plugins/wrap/tinymce/editor_plugin.js | 4 ++-- .../tinymce/plugins/wrap/tinymce/img/ed_wrap.gif | Bin 180 -> 0 bytes lib/editor/tinymce/upgrade.txt | 2 ++ 5 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 lib/editor/tinymce/plugins/wrap/pix/icon.png delete mode 100644 lib/editor/tinymce/plugins/wrap/tinymce/img/ed_wrap.gif diff --git a/lib/editor/tinymce/lib.php b/lib/editor/tinymce/lib.php index 5bbd665468a..ac912e7cf44 100644 --- a/lib/editor/tinymce/lib.php +++ b/lib/editor/tinymce/lib.php @@ -158,7 +158,7 @@ class tinymce_texteditor extends texteditor { 'plugins' => 'lists,table,style,layer,advhr,advlink,emotions,inlinepopups,' . 'searchreplace,paste,directionality,fullscreen,nonbreaking,contextmenu,' . 'insertdatetime,save,iespell,preview,print,noneditable,visualchars,' . - 'xhtmlxtras,template,pagebreak,wrap', + 'xhtmlxtras,template,pagebreak', 'gecko_spellcheck' => true, 'theme_advanced_font_sizes' => "1,2,3,4,5,6,7", 'theme_advanced_layout_manager' => "SimpleLayout", diff --git a/lib/editor/tinymce/plugins/wrap/pix/icon.png b/lib/editor/tinymce/plugins/wrap/pix/icon.png deleted file mode 100644 index 3f21ab4b4ea0c88d879f8dcc8269f2616dacddbf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|&H|6fVg?3oVGw3ym^DWNDEP+H z#WBP}@abejzGed+SL3n=LUUSX3V*eVVd0b8s);)6&wn4~ z^z-^}nljI|%`xS+%Dk9wu_>{v@{i@8_wN(WlxlVrEQpStwqAkd(n{N_YNlEY&kSv5 z<>>6?70V5am=q`#S$CxAV-uPL?t-Z`fCNNq)Yc-kzStp-dfF8+ep9 zUa&gZthb>>FGRRsQej#N9qHbs_2|AGRfw=7>^9cJGe^&$UNT*}KULDDg4sz84;c)I$z JtaD0e0surlbg=*c diff --git a/lib/editor/tinymce/plugins/wrap/tinymce/editor_plugin.js b/lib/editor/tinymce/plugins/wrap/tinymce/editor_plugin.js index 95df13ae1d2..af3d992d4dc 100644 --- a/lib/editor/tinymce/plugins/wrap/tinymce/editor_plugin.js +++ b/lib/editor/tinymce/plugins/wrap/tinymce/editor_plugin.js @@ -46,7 +46,7 @@ return '' + '' + separator + '' + '' + separator + ''; - }, + } }); @@ -60,7 +60,7 @@ * @return mixed - false or the new control */ createControl : function(name, cc) { - if (name === "wrap" || name === "!") { + if (name === "wrap") { return new tinymce.ui.Wrap(); } return false; diff --git a/lib/editor/tinymce/plugins/wrap/tinymce/img/ed_wrap.gif b/lib/editor/tinymce/plugins/wrap/tinymce/img/ed_wrap.gif deleted file mode 100644 index 1eea21982b6f8c9385d35e24544f78188f38a2c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 180 zcmV;l089TzNk%w1VG;lm0P_z300008002J#0CyoFzyJXA0093C4C_fr|Dd4%y}kd+ z%KzHh|L5ob@9+Qj_y7O@A^8La000jFEC2ui01^Na06+v`@X1Ll1rOt7$~jtQjpTF~ z$b=kAsTf8pA&6Yw681PpK?sIJBX^lJI)Wa`p{qC+4xIF+Knx`gM$`fT2z-pkSI{kH i00BZ_P1d<{-S7JMo^$~N&m)j82uKJhQ-g#Q5db^X8%90= diff --git a/lib/editor/tinymce/upgrade.txt b/lib/editor/tinymce/upgrade.txt index ae7aa6ddbe2..a8b2c157424 100644 --- a/lib/editor/tinymce/upgrade.txt +++ b/lib/editor/tinymce/upgrade.txt @@ -5,6 +5,8 @@ information provided here is intended especially for developers. === 2.6 === * added a new plugin to toggle the 2nd and 3rd toolbars +* added a new plugin to wrap the toolbars on small screens. +This plugin will be automatically added to existing toolbars by replacing the middle occurrence of | with "wrap". === 2.5 ===