WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TinyMCE: update to 4.2.2. Changelog: https://github.com/tinymce/tinymce/blob/master/changelog.txt. 

Fixes #33033, #33042. See #33083.
Built from https://develop.svn.wordpress.org/trunk@33369


git-svn-id: http://core.svn.wordpress.org/trunk@33341 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2015-07-22 21:12:24 +00:00
parent 7aa41d1e37
commit 92395fdd8d
5 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,7 @@
tinymce.ThemeManager.add('modern', function(editor) {
var self = this, settings = editor.settings, Factory = tinymce.ui.Factory,
each = tinymce.each, DOM = tinymce.DOM, Rect = tinymce.ui.Rect;
each = tinymce.each, DOM = tinymce.DOM, Rect = tinymce.ui.Rect, FloatPanel = tinymce.ui.FloatPanel;
// Default menus
var defaultMenus = {
@ -480,7 +480,9 @@ tinymce.ThemeManager.add('modern', function(editor) {
function repositionHandler() {
function execute() {
reposition(findFrontMostMatch(editor.selection.getNode()));
if (editor.selection) {
reposition(findFrontMostMatch(editor.selection.getNode()));
}
}
if (window.requestAnimationFrame) {
@ -639,10 +641,7 @@ tinymce.ThemeManager.add('modern', function(editor) {
panel.hide();
// All other autohidden float panels will be closed below.
// Need to check for hideAll since it might be a normal panel
if (panel.hideAll) {
panel.hideAll();
}
FloatPanel.hideAll();
DOM.removeClass(editor.getBody(), 'mce-edit-focus');
}

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

File diff suppressed because one or more lines are too long

14
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.3-beta3-33368';
$wp_version = '4.3-beta3-33369';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
@ -18,7 +18,7 @@ $wp_db_version = 33055;
*
* @global string $tinymce_version
*/
$tinymce_version = '4201-20150630';
$tinymce_version = '4202-20150722';
/**
* Holds the required PHP version