mirror of
https://github.com/WordPress/WordPress.git
synced 2025-02-22 14:35:07 +00:00
TinyMCE: update to the latest dev. version, 4.1.6+. Fixes #30411.
Built from https://develop.svn.wordpress.org/trunk@30397 git-svn-id: http://core.svn.wordpress.org/trunk@30393 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
3e3c383e79
commit
d4a36f2c7a
File diff suppressed because one or more lines are too long
27
wp-includes/js/tinymce/tiny_mce_popup.js
vendored
27
wp-includes/js/tinymce/tiny_mce_popup.js
vendored
@ -249,18 +249,21 @@ var tinyMCEPopup = {
|
|||||||
* @param {string} element_id Element id to be filled with the color value from the picker.
|
* @param {string} element_id Element id to be filled with the color value from the picker.
|
||||||
*/
|
*/
|
||||||
pickColor : function(e, element_id) {
|
pickColor : function(e, element_id) {
|
||||||
this.execCommand('mceColorPicker', true, {
|
var el = document.getElementById(element_id), colorPickerCallback = this.editor.settings.color_picker_callback;
|
||||||
color : document.getElementById(element_id).value,
|
if (colorPickerCallback) {
|
||||||
func : function(c) {
|
colorPickerCallback.call(
|
||||||
document.getElementById(element_id).value = c;
|
this.editor,
|
||||||
|
function (value) {
|
||||||
try {
|
el.value = value;
|
||||||
document.getElementById(element_id).onchange();
|
try {
|
||||||
} catch (ex) {
|
el.onchange();
|
||||||
// Try fire event, ignore errors
|
} catch (ex) {
|
||||||
}
|
// Try fire event, ignore errors
|
||||||
}
|
}
|
||||||
});
|
},
|
||||||
|
el.value
|
||||||
|
);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
20
wp-includes/js/tinymce/tinymce.min.js
vendored
20
wp-includes/js/tinymce/tinymce.min.js
vendored
File diff suppressed because one or more lines are too long
Binary file not shown.
@ -18,7 +18,7 @@ $wp_db_version = 30133;
|
|||||||
*
|
*
|
||||||
* @global string $tinymce_version
|
* @global string $tinymce_version
|
||||||
*/
|
*/
|
||||||
$tinymce_version = '4106-20141113';
|
$tinymce_version = '4106-20141119';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Holds the required PHP version
|
* Holds the required PHP version
|
||||||
|
Loading…
x
Reference in New Issue
Block a user