mirror of
https://github.com/WordPress/WordPress.git
synced 2024-09-29 15:47:38 +02:00
TinyMCE: update to 4.6.1. Changelog: https://www.tinymce.com/docs/changelog/#version461-may102017
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:
parent
da92cce494
commit
8c46657c9d
@ -1639,7 +1639,9 @@ define(
|
|||||||
editor.on('init', function () {
|
editor.on('init', function () {
|
||||||
setupCommands(editor);
|
setupCommands(editor);
|
||||||
setupStateHandlers(editor);
|
setupStateHandlers(editor);
|
||||||
setupTabKey(editor);
|
if (editor.getParam('lists_indent_on_tab', true)) {
|
||||||
|
setupTabKey(editor);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
File diff suppressed because one or more lines are too long
@ -2136,7 +2136,8 @@ define(
|
|||||||
var dom = editor.dom, node = editor.selection.getNode();
|
var dom = editor.dom, node = editor.selection.getNode();
|
||||||
|
|
||||||
content = content.replace(/(<[^>]+) style="([^"]*)"([^>]*>)/gi, function (all, before, value, after) {
|
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") {
|
if (webKitStyles === "none") {
|
||||||
return before + after;
|
return before + after;
|
||||||
|
File diff suppressed because one or more lines are too long
@ -308,6 +308,7 @@ define(
|
|||||||
var poweredByElm = DOM.create('div', { 'class': 'mce-branding-powered-by' });
|
var poweredByElm = DOM.create('div', { 'class': 'mce-branding-powered-by' });
|
||||||
editor.getContainer().appendChild(poweredByElm);
|
editor.getContainer().appendChild(poweredByElm);
|
||||||
DOM.bind(poweredByElm, 'click', hide(poweredByElm));
|
DOM.bind(poweredByElm, 'click', hide(poweredByElm));
|
||||||
|
reposition(editor, poweredByElm)();
|
||||||
editor.on('NodeChange ResizeEditor', reposition(editor, poweredByElm));
|
editor.on('NodeChange ResizeEditor', reposition(editor, poweredByElm));
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
File diff suppressed because one or more lines are too long
29
wp-includes/js/tinymce/tinymce.min.js
vendored
29
wp-includes/js/tinymce/tinymce.min.js
vendored
File diff suppressed because one or more lines are too long
Binary file not shown.
@ -4,7 +4,7 @@
|
|||||||
*
|
*
|
||||||
* @global string $wp_version
|
* @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.
|
* 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
|
* @global string $tinymce_version
|
||||||
*/
|
*/
|
||||||
$tinymce_version = '4600-20170506';
|
$tinymce_version = '4601-20170510';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Holds the required PHP version
|
* Holds the required PHP version
|
||||||
|
Loading…
Reference in New Issue
Block a user