Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-28 23:27:39 +02:00
Code Issues Projects Releases Wiki Activity

Update TinyMCE to the current development version, 4.0.21.1. Fixes #27744

Browse Source 
Built from https://develop.svn.wordpress.org/trunk@28066


git-svn-id: http://core.svn.wordpress.org/trunk@27898 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2014-04-10 21:09:16 +00:00
parent 58ca03f8ea
commit c631d144f1
4 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
wp-includes/js/tinymce/tinymce.js
View File

@ -1,4 +1,4 @@
// 4.0.21 (2014-04-01)
// 4.0.21.1 (2014-04-09)
/**
* Compiled inline version. (Library mode)
@ -7997,12 +7997,21 @@ define("tinymce/AddOnManager", [
* @param {String} languages Optional comma or space separated list of languages to check if it matches the name.
*/
requireLangPack: function(name, languages) {
if (AddOnManager.language && AddOnManager.languageLoad !== false) {
if (languages && new RegExp('([, ]|\\b)' + AddOnManager.language + '([, ]|\\b)').test(languages) === false) {
return;
var language = AddOnManager.language;
if (language && AddOnManager.languageLoad !== false) {
if (languages) {
languages = ',' + languages + ',';
// Load short form sv.js or long form sv_SE.js
if (languages.indexOf(',' + language.substr(0, 2) + ',') != -1) {
language = language.substr(0, 2);
} else if (languages.indexOf(',' + language + ',') == -1) {
return;
}
}
ScriptLoader.ScriptLoader.add(this.urls[name] + '/langs/' + AddOnManager.language + '.js');
ScriptLoader.ScriptLoader.add(this.urls[name] + '/langs/' + language + '.js');
}
},
@ -17165,12 +17174,12 @@ define("tinymce/UndoManager", [
return null;
}
if (editor.fire('BeforeAddUndo', {level: level, originalEvent: event}).isDefaultPrevented()) {
lastLevel = data[index];
if (editor.fire('BeforeAddUndo', {level: level, lastLevel: lastLevel, originalEvent: event}).isDefaultPrevented()) {
return null;
}
// Add undo level if needed
lastLevel = data[index];
if (lastLevel && lastLevel.content == level.content) {
return null;
}
@ -28788,7 +28797,7 @@ define("tinymce/EditorManager", [
* @property minorVersion
* @type String
*/
minorVersion : '0.21',
minorVersion : '0.21.1',
/**
* Release date of TinyMCE build.
@ -28796,7 +28805,7 @@ define("tinymce/EditorManager", [
* @property releaseDate
* @type String
*/
releaseDate: '2014-04-01',
releaseDate: '2014-04-09',
/**
* Collection of editor instances.

10
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.

2
wp-includes/version.php
View File

@ -18,7 +18,7 @@ $wp_db_version = 27916;
*
* @global string $tinymce_version
*/
$tinymce_version = '4021-20140407';
$tinymce_version = '4021-20140410';
/**
* Holds the required PHP version