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

TinuMCE: update to 3.5.7, fixes #21173

Browse Source 
git-svn-id: http://core.svn.wordpress.org/trunk@22550 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2012-11-12 21:20:46 +00:00
parent 78f0c0a9df
commit 114c42a3b5
27 changed files with 67 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm
View File

@ -3,7 +3,7 @@
<head>
<title></title>
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<script type="text/javascript" src="../../tiny_mce.js?ver=356-20120818"></script>
<script type="text/javascript" src="../../tiny_mce.js?ver=357-20121111"></script>
<script type="text/javascript">
function patchCallback(settings, key) {
if (settings[key])

2
wp-includes/js/tinymce/plugins/inlinepopups/template.htm
View File

@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Template for dialogs</title>
<link rel="stylesheet" type="text/css" href="skins/clearlooks2/window.css?ver=356-20120818" />
<link rel="stylesheet" type="text/css" href="skins/clearlooks2/window.css?ver=357-20121111" />
</head>
<body>

14
wp-includes/js/tinymce/plugins/media/media.htm
View File

@ -2,13 +2,13 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>{#media_dlg.title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=356-20120818"></script>
<script type="text/javascript" src="js/media.js?ver=356-20120818"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=356-20120818"></script>
<script type="text/javascript" src="../../utils/validate.js?ver=356-20120818"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=356-20120818"></script>
<script type="text/javascript" src="../../utils/editable_selects.js?ver=356-20120818"></script>
<link href="css/media.css?ver=356-20120818" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=357-20121111"></script>
<script type="text/javascript" src="js/media.js?ver=357-20121111"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=357-20121111"></script>
<script type="text/javascript" src="../../utils/validate.js?ver=357-20121111"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=357-20121111"></script>
<script type="text/javascript" src="../../utils/editable_selects.js?ver=357-20121111"></script>
<link href="css/media.css?ver=357-20121111" rel="stylesheet" type="text/css" />
</head>
<body style="display: none" role="application">
<form onsubmit="Media.insert();return false;" action="#">

2
wp-includes/js/tinymce/plugins/paste/editor_plugin.js
View File

File diff suppressed because one or more lines are too long

18
wp-includes/js/tinymce/plugins/paste/editor_plugin_src.js
View File

@ -23,6 +23,7 @@
paste_convert_headers_to_strong : false,
paste_dialog_width : "450",
paste_dialog_height : "400",
paste_max_consecutive_linebreaks: 2,
paste_text_use_dialog : false,
paste_text_sticky : false,
paste_text_sticky_default : false,
@ -790,10 +791,23 @@
[/<\/t[dh]>\s*<t[dh][^>]*>/gi, "\t"], // Table cells get tabs betweem them
/<[a-z!\/?][^>]*>/gi, // Delete all remaining tags
[/&nbsp;/gi, " "], // Convert non-break spaces to regular spaces (remember, *plain text*)
[/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi, "$1"],// Cool little RegExp deletes whitespace around linebreak chars.
[/\n{3,}/g, "\n\n"] // Max. 2 consecutive linebreaks
[/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi, "$1"] // Cool little RegExp deletes whitespace around linebreak chars.
]);
var maxLinebreaks = Number(getParam(ed, "paste_max_consecutive_linebreaks"));
if (maxLinebreaks > -1) {
var maxLinebreaksRegex = new RegExp("\n{" + (maxLinebreaks + 1) + ",}", "g");
var linebreakReplacement = "";
while (linebreakReplacement.length < maxLinebreaks) {
linebreakReplacement += "\n";
}
process([
[maxLinebreaksRegex, linebreakReplacement] // Limit max consecutive linebreaks
]);
}
content = ed.dom.decode(tinymce.html.Entities.encodeRaw(content));
// Perform default or custom replacements

4
wp-includes/js/tinymce/plugins/paste/pastetext.htm
View File

@ -1,8 +1,8 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>{#paste.paste_text_desc}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=356-20120818"></script>
<script type="text/javascript" src="js/pastetext.js?ver=356-20120818"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=357-20121111"></script>
<script type="text/javascript" src="js/pastetext.js?ver=357-20121111"></script>
</head>
<body onresize="PasteTextDialog.resize();" style="display:none; overflow:hidden;">
<form name="source" onsubmit="return PasteTextDialog.insert();" action="#">

4
wp-includes/js/tinymce/plugins/paste/pasteword.htm
View File

@ -1,8 +1,8 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>{#paste.paste_word_desc}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=356-20120818"></script>
<script type="text/javascript" src="js/pasteword.js?ver=356-20120818"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=357-20121111"></script>
<script type="text/javascript" src="js/pasteword.js?ver=357-20121111"></script>
</head>
<body onresize="PasteWordDialog.resize();" style="display:none; overflow:hidden;">
<form name="source" onsubmit="return PasteWordDialog.insert();" action="#">

6
wp-includes/js/tinymce/plugins/wpeditimage/editimage.html
View File

@ -4,9 +4,9 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title></title>
<link rel="stylesheet" href="css/editimage.css?ver=356-20120818" type="text/css" media="all" />
<script type="text/javascript" src="js/editimage.min.js?ver=356-20120818"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=356-20120818"></script>
<link rel="stylesheet" href="css/editimage.css?ver=357-20121111" type="text/css" media="all" />
<script type="text/javascript" src="js/editimage.min.js?ver=357-20121111"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=357-20121111"></script>
<base target="_self" />
</head>

6
wp-includes/js/tinymce/themes/advanced/about.htm
View File

@ -2,9 +2,9 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>{#advanced_dlg.about_title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=356-20120818"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=356-20120818"></script>
<script type="text/javascript" src="js/about.js?ver=356-20120818"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=357-20121111"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=357-20121111"></script>
<script type="text/javascript" src="js/about.js?ver=357-20121111"></script>
</head>
<body id="about" style="display: none">
<div class="tabs">

4
wp-includes/js/tinymce/themes/advanced/anchor.htm
View File

@ -2,8 +2,8 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>{#advanced_dlg.anchor_title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=356-20120818"></script>
<script type="text/javascript" src="js/anchor.js?ver=356-20120818"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=357-20121111"></script>
<script type="text/javascript" src="js/anchor.js?ver=357-20121111"></script>
</head>
<body style="display: none" role="application" aria-labelledby="app_title">
<form onsubmit="AnchorDialog.update();return false;" action="#">

4
wp-includes/js/tinymce/themes/advanced/charmap.htm
View File

@ -2,8 +2,8 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>{#advanced_dlg.charmap_title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=356-20120818"></script>
<script type="text/javascript" src="js/charmap.js?ver=356-20120818"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=357-20121111"></script>
<script type="text/javascript" src="js/charmap.js?ver=357-20121111"></script>
</head>
<body id="charmap" style="display:none" role="application">
<table align="center" border="0" cellspacing="0" cellpadding="2" role="presentation">

6
wp-includes/js/tinymce/themes/advanced/color_picker.htm
View File

@ -2,9 +2,9 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>{#advanced_dlg.colorpicker_title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=356-20120818"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=356-20120818"></script>
<script type="text/javascript" src="js/color_picker.js?ver=356-20120818"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=357-20121111"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=357-20121111"></script>
<script type="text/javascript" src="js/color_picker.js?ver=357-20121111"></script>
</head>
<body id="colorpicker" style="display: none" role="application" aria-labelledby="app_label">
<span class="mceVoiceLabel" id="app_label" style="display:none;">{#advanced_dlg.colorpicker_title}</span>

2
wp-includes/js/tinymce/themes/advanced/editor_template.js
View File

File diff suppressed because one or more lines are too long

2
wp-includes/js/tinymce/themes/advanced/editor_template_src.js
View File

@ -956,7 +956,7 @@
a = s.theme_advanced_toolbar_align.toLowerCase();
a = 'mce' + t._ufirst(a);
n = DOM.add(DOM.add(c, 'tr', {role: 'presentation'}), 'td', {'class' : 'mceToolbar ' + a, "role":"presentation"});
n = DOM.add(DOM.add(c, 'tr', {role: 'toolbar'}), 'td', {'class' : 'mceToolbar ' + a, "role":"toolbar"});
// Create toolbar and add the controls
for (i=1; (v = s['theme_advanced_buttons' + i]); i++) {

8
wp-includes/js/tinymce/themes/advanced/image.htm
View File

@ -2,10 +2,10 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>{#advanced_dlg.image_title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=356-20120818"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=356-20120818"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=356-20120818"></script>
<script type="text/javascript" src="js/image.js?ver=356-20120818"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=357-20121111"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=357-20121111"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=357-20121111"></script>
<script type="text/javascript" src="js/image.js?ver=357-20121111"></script>
</head>
<body id="image" style="display: none">
<form onsubmit="ImageDialog.update();return false;" action="#">

BIN
wp-includes/js/tinymce/themes/advanced/img/colorpicker.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
wp-includes/js/tinymce/themes/advanced/img/icons.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

10
wp-includes/js/tinymce/themes/advanced/link.htm
View File

@ -2,11 +2,11 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>{#advanced_dlg.link_title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=356-20120818"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=356-20120818"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=356-20120818"></script>
<script type="text/javascript" src="../../utils/validate.js?ver=356-20120818"></script>
<script type="text/javascript" src="js/link.js?ver=356-20120818"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=357-20121111"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=357-20121111"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=357-20121111"></script>
<script type="text/javascript" src="../../utils/validate.js?ver=357-20121111"></script>
<script type="text/javascript" src="js/link.js?ver=357-20121111"></script>
</head>
<body id="link" style="display: none">
<form onsubmit="LinkDialog.update();return false;" action="#">

2
wp-includes/js/tinymce/themes/advanced/shortcuts.htm
View File

@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>{#advanced_dlg.accessibility_help}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=356-20120818"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=357-20121111"></script>
<script type="text/javascript">tinyMCEPopup.requireLangPack();</script>
</head>
<body id="content">

BIN
wp-includes/js/tinymce/themes/advanced/skins/default/img/buttons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
wp-includes/js/tinymce/themes/advanced/skins/default/img/progress.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
wp-includes/js/tinymce/themes/advanced/skins/o2k7/img/button_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
wp-includes/js/tinymce/themes/advanced/skins/o2k7/img/button_bg_black.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 630 B

After

Width:  |  Height:  |  Size: 651 B

4
wp-includes/js/tinymce/themes/advanced/source_editor.htm
View File

@ -1,8 +1,8 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>{#advanced_dlg.code_title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=356-20120818"></script>
<script type="text/javascript" src="js/source_editor.js?ver=356-20120818"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=357-20121111"></script>
<script type="text/javascript" src="js/source_editor.js?ver=357-20121111"></script>
</head>
<body onresize="resizeInputs();" style="display:none; overflow:hidden;" spellcheck="false">
<form name="source" onsubmit="saveContent();return false;" action="#">

2
wp-includes/js/tinymce/tiny_mce.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/js/tinymce/wp-mce-help.php
View File

@ -14,7 +14,7 @@ header('Content-Type: text/html; charset=' . get_bloginfo('charset'));
<head>
<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
<title><?php _e('Rich Editor Help'); ?></title>
<script type="text/javascript" src="tiny_mce_popup.js?ver=356-20120818"></script>
<script type="text/javascript" src="tiny_mce_popup.js?ver=357-20121111"></script>
<?php
wp_admin_css( 'wp-admin', true );
?>

2
wp-includes/version.php
View File

@ -18,7 +18,7 @@ $wp_db_version = 22441;
*
* @global string $tinymce_version
*/
$tinymce_version = '356-22438';
$tinymce_version = '357-20121111';
/**
* Holds the required PHP version