Skip to content

Commit

Permalink
update tinymce to v4.6.1 and add exp comment to our editor plugins; a…
Browse files Browse the repository at this point in the history
…dd missing files from plupload needed for older browsers
  • Loading branch information
dleffler committed May 13, 2017
1 parent a7ae00e commit 9ff58f0
Show file tree
Hide file tree
Showing 13 changed files with 103 additions and 40 deletions.
2 changes: 1 addition & 1 deletion external/ExtPrograms.csv
Expand Up @@ -40,7 +40,7 @@ html5shiv,3.7.3,github.com/aFarkas/html5shiv,3.7.3,IE6-8 shim
csshover.htc,3.11,peterned.home.xs4all.nl/csshover.html,3.11,IE6 shim
excanvas,r3,code.google.com/p/explorercanvas/,r3,IE6-8 shim needed by TimesCircle
CKEditor,4.6.2,ckeditor.com,4.6.2,"add fieldinsert (exp), tableresize, sourcedialog, image2 & imageupload widgets & kama skin"
TinyMCE,4.6.0,tinymce.com,4.6.0,"add fieldinsert (exp) & quickupload plugins, & xenmce skin"
TinyMCE,4.6.1,tinymce.com,4.6.1,"add fieldinsert (exp) & quickupload (exp) plugins, & xenmce skin"
PLUpload,2.3.1,github.com/moxiecode/plupload,3.1.0,"needed for TinyMCE Quick Upload, placed in that plugin folder"
elFinder,2.1.23n,elfinder.org,2.1.23n,"use https://github.com/nao-pon/elFinder, customized in /framework with Exponent php classes and .js files"
jQuery1,1.12.4,jquery.com,1.12.4,v1.11.3 still needed for old firefox
Expand Down
2 changes: 1 addition & 1 deletion external/editors/ckeditor/plugins/fieldinsert/plugin.js
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2004-2016 OIC Group, Inc.
* Copyright (c) 2004-2017 OIC Group, Inc.
*
* This file is part of Exponent
*
Expand Down
13 changes: 13 additions & 0 deletions external/editors/tinymce/changelog.txt
@@ -1,3 +1,16 @@
Version 4.6.1 (2017-05-10)
Added configuration option to list plugin to disable tab indentation.
Fixed bug where format change on very specific content could cause the selection to change.
Fixed bug where TinyMCE could not be lazyloaded through jquery integration.
Fixed bug where entities in style attributes weren't decoded correctly on paste in webkit.
Fixed bug where fontsize_formats option had been renamed incorrectly.
Fixed bug with broken backspace/delete behaviour between contenteditable=false blocks.
Fixed bug where it wasn't possible to backspace to the previous line with the inline boundaries functionality turned on.
Fixed bug where is wasn't possible to move caret left and right around a linked image with the inline boundaries functionality turned on.
Fixed bug where pressing enter after/before hr element threw exception. Patch contributed bradleyke.
Fixed so the CSS in the visualblocks plugin doesn't overwrite background color. Patch contributed by Christian Rank.
Fixed bug where multibyte characters weren't encoded correctly. Patch contributed by James Tarkenton.
Fixed bug where shift-click to select within contenteditable=true fields wasn't working.
Version 4.6.0 (2017-05-04)
Dropped support for IE 8-10 due to market share and lack of support from Microsoft. See tinymce docs for details.
Added an inline boundary caret position feature that makes it easier to type at the beginning/end of links/code elements.
Expand Down
2 changes: 1 addition & 1 deletion external/editors/tinymce/jquery.tinymce.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 16 additions & 1 deletion external/editors/tinymce/plugins/fieldinsert/plugin.js
@@ -1,3 +1,18 @@
/*
* Copyright (c) 2004-2017 OIC Group, Inc.
*
* This file is part of Exponent
*
* Exponent 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 2 of the
* License, or (at your option) any later version.
*
* GPL: http://www.gnu.org/licenses/gpl.txt
*
*/

/**
* plugin.js
*
Expand All @@ -13,7 +28,7 @@
tinymce.PluginManager.add('fieldinsert', function(editor) {
var menuItems = [], lastFormat;

// Add a button that inserts time
// Add a menu button to the toolbar
editor.addButton('fieldinsert', {
type: 'menubutton',
// text: 'Field',
Expand Down

0 comments on commit 9ff58f0

Please sign in to comment.