Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-10-05 02:58:51 +02:00
Code Issues Projects Releases Wiki Activity

TinyMCE: update to 4.3.8, changelog: https://www.tinymce.com/docs/changelog/#version438-march152016.

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


git-svn-id: http://core.svn.wordpress.org/trunk@36967 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2016-03-15 21:38:26 +00:00
parent 12c6679165
commit aa8462c59f
7 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -433,9 +433,9 @@ tinymce.PluginManager.add('lists', function(editor) {
return true; return true;
} }
if (sibling && sibling.nodeName == 'LI' && isListNode(li.lastChild)) { /*if (sibling && sibling.nodeName == 'LI' && isListNode(li.lastChild)) {
return false; return false;
} }*/
sibling = li.previousSibling; sibling = li.previousSibling;
if (sibling && sibling.nodeName == 'LI') { if (sibling && sibling.nodeName == 'LI') {
@ -695,11 +695,15 @@ tinymce.PluginManager.add('lists', function(editor) {
} }
nonEmptyBlocks = editor.schema.getNonEmptyElements(); nonEmptyBlocks = editor.schema.getNonEmptyElements();
walker = new tinymce.dom.TreeWalker(rng.startContainer, editor.getBody()); if (node.nodeType == 1) {
node = tinymce.dom.RangeUtils.getNode(node, offset);
}
walker = new tinymce.dom.TreeWalker(node, editor.getBody());
// Delete at <li>|<br></li> then jump over the bogus br // Delete at <li>|<br></li> then jump over the bogus br
if (isForward) { if (isForward) {
if (isBogusBr(tinymce.dom.RangeUtils.getNode(rng.startContainer, rng.startOffset))) { if (isBogusBr(node)) {
walker.next(); walker.next();
} }
} }

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

File diff suppressed because one or more lines are too long

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

@ -797,14 +797,14 @@ tinymce.ThemeManager.add('modern', function(editor) {
]}); ]});
} }
if (settings.readonly) {
panel.find('*').disabled(true);
}
editor.fire('BeforeRenderUI'); editor.fire('BeforeRenderUI');
editor.on('SwitchMode', switchMode()); editor.on('SwitchMode', switchMode());
panel.renderBefore(args.targetNode).reflow(); panel.renderBefore(args.targetNode).reflow();
if (settings.readonly) {
editor.setMode('readonly');
}
if (settings.width) { if (settings.width) {
tinymce.DOM.setStyle(panel.getEl(), 'width', settings.width); tinymce.DOM.setStyle(panel.getEl(), 'width', settings.width);
} }

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

File diff suppressed because one or more lines are too long

22
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 * @global string $wp_version
*/ */
$wp_version = '4.5-beta3-36999'; $wp_version = '4.5-beta3-37000';
/** /**
* 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 = 36686;
* *
* @global string $tinymce_version * @global string $tinymce_version
*/ */
$tinymce_version = '4307-20160302'; $tinymce_version = '4308-20160315';
/** /**
* Holds the required PHP version * Holds the required PHP version