Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-23 13:24:57 +02:00
Code Issues Projects Releases Wiki Activity

TinyMCE: update to 4.6.1. Changelog: https://www.tinymce.com/docs/changelog/#version461-may102017

Browse Source 
Fixes #40727.
Built from https://develop.svn.wordpress.org/trunk@40645


git-svn-id: http://core.svn.wordpress.org/trunk@40506 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2017-05-11 23:12:40 +00:00
parent da92cce494
commit 8c46657c9d
9 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/js/tinymce/plugins/lists/plugin.js
View File

@ -1639,7 +1639,9 @@ define(
editor.on('init', function () {
setupCommands(editor);
setupStateHandlers(editor);
setupTabKey(editor);
if (editor.getParam('lists_indent_on_tab', true)) {
setupTabKey(editor);
}
});
return {

2
wp-includes/js/tinymce/plugins/lists/plugin.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
wp-includes/js/tinymce/plugins/paste/plugin.js
View File

@ -2136,7 +2136,8 @@ define(
var dom = editor.dom, node = editor.selection.getNode();
content = content.replace(/(<[^>]+) style="([^"]*)"([^>]*>)/gi, function (all, before, value, after) {
var inputStyles = dom.parseStyle(value, 'span'), outputStyles = {};
var inputStyles = dom.parseStyle(dom.decode(value), 'span');
var outputStyles = {};
if (webKitStyles === "none") {
return before + after;

2
wp-includes/js/tinymce/plugins/paste/plugin.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
wp-includes/js/tinymce/themes/modern/theme.js
View File

@ -308,6 +308,7 @@ define(
var poweredByElm = DOM.create('div', { 'class': 'mce-branding-powered-by' });
editor.getContainer().appendChild(poweredByElm);
DOM.bind(poweredByElm, 'click', hide(poweredByElm));
reposition(editor, poweredByElm)();
editor.on('NodeChange ResizeEditor', reposition(editor, poweredByElm));
});
};

2
wp-includes/js/tinymce/themes/modern/theme.min.js vendored
View File

File diff suppressed because one or more lines are too long

29
wp-includes/js/tinymce/tinymce.min.js vendored
View File

File diff suppressed because one or more lines are too long

BIN
wp-includes/js/tinymce/wp-tinymce.js.gz
View File

Binary file not shown.

4
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.8-alpha-40644';
$wp_version = '4.8-alpha-40645';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
@ -18,7 +18,7 @@ $wp_db_version = 38590;
*
* @global string $tinymce_version
*/
$tinymce_version = '4600-20170506';
$tinymce_version = '4601-20170510';
/**
* Holds the required PHP version