Skip to content

Commit

Permalink
Item14323: Update to TinyMCE 4.7.4
Browse files Browse the repository at this point in the history 
Update to 4.7.4.  Bump version so that we can release a testing package.
Also change to date based version string.
  • Loading branch information
@gac410
gac410 committed Dec 13, 2017
1 parent 2401ee2 commit 1500de0
Show file tree
Hide file tree
Showing 15 changed files with 75 additions and 65 deletions.
43 changes: 22 additions & 21 deletions TinyMCEPlugin/data/System/TinyMCEPlugin.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1511645072" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1513174883" format="1.1" version="1"}%
%META:TOPICPARENT{name="Plugins"}%
---+!! !TinyMCEPlugin
<!--
Expand Down Expand Up @@ -156,6 +156,7 @@ See the [[%ATTACHURLPATH%/tinymce/changelog.txt][TinyMCE Editor Change Log]] for
&copy; 2010-2017 [[%SYSTEMWEB%.ProjectContributor][Foswiki Contributors]] |
| | This package also includes a complete release of the !TinyMCE editor which is covered by the [[https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html][GNU Lesser General Public License, Version 2.1] |
| Change History: | <!-- versions below in reverse order -->&nbsp; |
| 2.05 | Foswikitask:Item14323: Upgrade to TinyMCE 4.7,4, |
| 2.04 | Foswikitask:Item14323: Upgrade to TinyMCE 4.7,3, |
| 2.03 | Foswikitask:Item14323: Upgrade to TinyMCE 4.7,0, |
| 2.02 | Foswikitask:Item14323: Upgrade to TinyMCE 4.6.7. |
Expand Down Expand Up @@ -276,23 +277,23 @@ Many thanks to the following sponsors for supporting this work:
%META:FIELD{name="License" title="License" value="[[http://www.gnu.org/licenses/gpl.html][GPL (Gnu General Public License)]]"}%
%META:FIELD{name="Home" title="Home" value="Foswiki:Extensions.%25$ROOTMODULE%25"}%
%META:FIELD{name="Support" title="Support" value="Foswiki:Support.%25$ROOTMODULE%25"}%
%META:FILEATTACHMENT{name="wysiwyg.css.gz" attr="h" comment="" date="1511645072" size="390" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.uncompressed.js" attr="h" comment="" date="1511645072" size="18556" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_hidden_verbatim.gif" attr="h" comment="" date="1511645072" size="1654" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermarks.psd" attr="h" comment="" date="1511645072" size="427691" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_literal.gif" attr="h" comment="" date="1511645072" size="1029" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_protect_on_save.gif" attr="h" comment="" date="1511645072" size="1492" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.uncompressed.js" attr="h" comment="" date="1511645072" size="4233" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.js.gz" attr="h" comment="" date="1511645072" size="2625" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wysiwyg_src.css" attr="h" comment="" date="1511645072" size="1007" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_verbatim.gif" attr="h" comment="" date="1511645072" size="1181" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wysiwyg.css" attr="h" comment="" date="1511645072" size="827" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot.png" attr="h" comment="" date="1511645072" size="30118" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_hidden.gif" attr="h" comment="" date="1511645072" size="950" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.js" attr="h" comment="" date="1511645072" size="1847" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.js.gz" attr="h" comment="" date="1511645072" size="869" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_protect_forever.gif" attr="h" comment="" date="1511645072" size="1494" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="tinymce.gif" attr="h" date="1511645072" size="35155" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1511645072" size="1343" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.js" attr="h" comment="" date="1511645072" size="8435" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Makefile" attr="h" comment="" date="1511645072" size="147" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wysiwyg.css.gz" attr="h" comment="" date="1513174883" size="390" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.uncompressed.js" attr="h" comment="" date="1513174883" size="18556" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_hidden_verbatim.gif" attr="h" comment="" date="1513174883" size="1654" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermarks.psd" attr="h" comment="" date="1513174883" size="427691" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_literal.gif" attr="h" comment="" date="1513174883" size="1029" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_protect_on_save.gif" attr="h" comment="" date="1513174883" size="1492" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.uncompressed.js" attr="h" comment="" date="1513174883" size="4233" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.js.gz" attr="h" comment="" date="1513174883" size="2625" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wysiwyg_src.css" attr="h" comment="" date="1513174883" size="1007" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_verbatim.gif" attr="h" comment="" date="1513174883" size="1181" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wysiwyg.css" attr="h" comment="" date="1513174883" size="827" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="screenshot.png" attr="h" comment="" date="1513174883" size="30118" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_hidden.gif" attr="h" comment="" date="1513174883" size="950" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.js" attr="h" comment="" date="1513174883" size="1847" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki.js.gz" attr="h" comment="" date="1513174883" size="869" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="watermark_protect_forever.gif" attr="h" comment="" date="1513174883" size="1494" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="tinymce.gif" attr="h" date="1513174883" size="35155" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" date="1513174883" size="1343" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="foswiki_tiny.js" attr="h" comment="" date="1513174883" size="8435" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="Makefile" attr="h" comment="" date="1513174883" size="147" user="ProjectContributor" version="1"}%
4 changes: 2 additions & 2 deletions TinyMCEPlugin/lib/Foswiki/Plugins/TinyMCEPlugin.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ use warnings;

use Assert;

our $VERSION = '2.04';
our $RELEASE = '2.04';
our $VERSION = '2.05';
our $RELEASE = '13 Dec 2017';
our $SHORTDESCRIPTION = 'Integration of the Tiny MCE WYSIWYG Editor';
our $NO_PREFS_IN_TOPIC = 1;

Expand Down
9 changes: 9 additions & 0 deletions TinyMCEPlugin/pub/System/TinyMCEPlugin/tinymce/changelog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
Version 4.7.4 (2017-12-05)
Fixed bug in the Nonbreaking Plugin where the nonbreaking_force_tab setting was being ignored.
Fixed bug in the Table Plugin where changing row height incorrectly converted column widths to pixels.
Fixed bug in the Table Plugin on Edge and IE11 where resizing the last column after resizing the table would cause invalid column heights.
Fixed bug in the Table Plugin where keyboard navigation was not normalized between browsers.
Fixed bug in the Table Plugin where the colorpicker button would show even without defining the colorpicker_callback.
Fixed bug in the Table Plugin where it wasn't possible to set the cell background color.
Fixed bug where Firefox would throw an error when intialising an editor on an element that is hidden or not yet added to the DOM.
Fixed bug where Firefox would throw an error when intialising an editor inside of a hidden iframe.
Version 4.7.3 (2017-11-23)
Added functionality to open the Codesample Plugin dialog when double clicking on a codesample. Patch contributed by dakuzen.
Fixed bug where undo/redo didn't work correctly with some formats and caret positions.
Expand Down

0 comments on commit 1500de0

Please sign in to comment.