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

Fixes #32262.
Built from https://develop.svn.wordpress.org/trunk@32366


git-svn-id: http://core.svn.wordpress.org/trunk@32336 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2015-05-06 03:23:25 +00:00
parent 364886a5be
commit 3181cc27a9
4 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/js/tinymce/tiny_mce_popup.js vendored
View File

@ -78,7 +78,7 @@ var tinyMCEPopup = {
* tinyMCEPopup.onInit.add(function(ed) { * tinyMCEPopup.onInit.add(function(ed) {
* alert(ed.selection.getContent()); * alert(ed.selection.getContent());
* }); * });
* *
* // Executes the init method on page load in some object using the SomeObject scope * // Executes the init method on page load in some object using the SomeObject scope
* tinyMCEPopup.onInit.add(SomeObject.init, SomeObject); * tinyMCEPopup.onInit.add(SomeObject.init, SomeObject);
*/ */
@ -327,7 +327,7 @@ var tinyMCEPopup = {
} }
}, },
// Internal functions // Internal functions
_restoreSelection : function() { _restoreSelection : function() {
var e = window.event.srcElement; var e = window.event.srcElement;
@ -359,7 +359,7 @@ var tinyMCEPopup = {
"browse": "Browse" "browse": "Browse"
}; };
var langCode = tinymce.settings.language || 'en'; var langCode = (tinymce.settings ? tinymce.settings : t.editor.settings).language || 'en';
for (var key in map) { for (var key in map) {
tinymce.i18n.data[langCode + "." + key] = tinymce.i18n.translate(map[key]); tinymce.i18n.data[langCode + "." + key] = tinymce.i18n.translate(map[key]);
} }
@ -523,7 +523,7 @@ tinymce.util.Dispatcher = function(scope) {
var self = this, returnValue, args = arguments, i, listeners = self.listeners, listener; var self = this, returnValue, args = arguments, i, listeners = self.listeners, listener;
self.inDispatch = true; self.inDispatch = true;
// Needs to be a real loop since the listener count might change while looping // Needs to be a real loop since the listener count might change while looping
// And this is also more efficient // And this is also more efficient
for (i = 0; i < listeners.length; i++) { for (i = 0; i < listeners.length; i++) {

23
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.3-alpha-32364'; $wp_version = '4.3-alpha-32366';
/** /**
* 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 = 32364;
* *
* @global string $tinymce_version * @global string $tinymce_version
*/ */
$tinymce_version = '4109-20150406'; $tinymce_version = '4110-20150505';
/** /**
* Holds the required PHP version * Holds the required PHP version