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

Upgrade to TinyMCE 3.5.8, fixes #22755 

git-svn-id: http://core.svn.wordpress.org/trunk@23090 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2012-12-06 04:50:31 +00:00
parent 54a390bea9
commit 449156f3c8
20 changed files with 71 additions and 61 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> <head>
<title></title> <title></title>
<meta http-equiv="X-UA-Compatible" content="IE=edge" /> <meta http-equiv="X-UA-Compatible" content="IE=edge" />
<script type="text/javascript" src="../../tiny_mce.js?ver=357-20121111"></script> <script type="text/javascript" src="../../tiny_mce.js?ver=358-20121205"></script>
<script type="text/javascript"> <script type="text/javascript">
function patchCallback(settings, key) { function patchCallback(settings, key) {
if (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"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title>Template for dialogs</title> <title>Template for dialogs</title>
<link rel="stylesheet" type="text/css" href="skins/clearlooks2/window.css?ver=357-20121111" /> <link rel="stylesheet" type="text/css" href="skins/clearlooks2/window.css?ver=358-20121205" />
</head> </head>
<body> <body>

44
wp-includes/js/tinymce/plugins/media/js/media.js
View File

@ -295,30 +295,40 @@
} else { } else {
src = getVal("src"); src = getVal("src");
// YouTube *NEW* // YouTube Embed
if (src.match(/youtu.be\/[a-z1-9.-_]+/)) { if (src.match(/youtube\.com\/embed\/\w+/)) {
data.width = 425; data.width = 425;
data.height = 350; data.height = 350;
data.params.frameborder = '0'; data.params.frameborder = '0';
data.type = 'iframe'; data.type = 'iframe';
src = 'http://www.youtube.com/embed/' + src.match(/youtu.be\/([a-z1-9.-_]+)/)[1];
setVal('src', src); setVal('src', src);
setVal('media_type', data.type); setVal('media_type', data.type);
} } else {
// YouTube *NEW*
if (src.match(/youtu\.be\/[a-z1-9.-_]+/)) {
data.width = 425;
data.height = 350;
data.params.frameborder = '0';
data.type = 'iframe';
src = 'http://www.youtube.com/embed/' + src.match(/youtu.be\/([a-z1-9.-_]+)/)[1];
setVal('src', src);
setVal('media_type', data.type);
}
// YouTube // YouTube
if (src.match(/youtube.com(.+)v=([^&]+)/)) { if (src.match(/youtube\.com(.+)v=([^&]+)/)) {
data.width = 425; data.width = 425;
data.height = 350; data.height = 350;
data.params.frameborder = '0'; data.params.frameborder = '0';
data.type = 'iframe'; data.type = 'iframe';
src = 'http://www.youtube.com/embed/' + src.match(/v=([^&]+)/)[1]; src = 'http://www.youtube.com/embed/' + src.match(/v=([^&]+)/)[1];
setVal('src', src); setVal('src', src);
setVal('media_type', data.type); setVal('media_type', data.type);
}
} }
// Google video // Google video
if (src.match(/video.google.com(.+)docid=([^&]+)/)) { if (src.match(/video\.google\.com(.+)docid=([^&]+)/)) {
data.width = 425; data.width = 425;
data.height = 326; data.height = 326;
data.type = 'flash'; data.type = 'flash';
@ -328,7 +338,7 @@
} }
// Vimeo // Vimeo
if (src.match(/vimeo.com\/([0-9]+)/)) { if (src.match(/vimeo\.com\/([0-9]+)/)) {
data.width = 425; data.width = 425;
data.height = 350; data.height = 350;
data.params.frameborder = '0'; data.params.frameborder = '0';
@ -339,7 +349,7 @@
} }
// stream.cz // stream.cz
if (src.match(/stream.cz\/((?!object).)*\/([0-9]+)/)) { if (src.match(/stream\.cz\/((?!object).)*\/([0-9]+)/)) {
data.width = 425; data.width = 425;
data.height = 350; data.height = 350;
data.params.frameborder = '0'; data.params.frameborder = '0';
@ -350,7 +360,7 @@
} }
// Google maps // Google maps
if (src.match(/maps.google.([a-z]{2,3})\/maps\/(.+)msid=(.+)/)) { if (src.match(/maps\.google\.([a-z]{2,3})\/maps\/(.+)msid=(.+)/)) {
data.width = 425; data.width = 425;
data.height = 350; data.height = 350;
data.params.frameborder = '0'; data.params.frameborder = '0';

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

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

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

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

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

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

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

@ -2,9 +2,9 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title>{#advanced_dlg.about_title}</title> <title>{#advanced_dlg.about_title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=357-20121111"></script> <script type="text/javascript" src="../../tiny_mce_popup.js?ver=358-20121205"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=357-20121111"></script> <script type="text/javascript" src="../../utils/mctabs.js?ver=358-20121205"></script>
<script type="text/javascript" src="js/about.js?ver=357-20121111"></script> <script type="text/javascript" src="js/about.js?ver=358-20121205"></script>
</head> </head>
<body id="about" style="display: none"> <body id="about" style="display: none">
<div class="tabs"> <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"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title>{#advanced_dlg.anchor_title}</title> <title>{#advanced_dlg.anchor_title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=357-20121111"></script> <script type="text/javascript" src="../../tiny_mce_popup.js?ver=358-20121205"></script>
<script type="text/javascript" src="js/anchor.js?ver=357-20121111"></script> <script type="text/javascript" src="js/anchor.js?ver=358-20121205"></script>
</head> </head>
<body style="display: none" role="application" aria-labelledby="app_title"> <body style="display: none" role="application" aria-labelledby="app_title">
<form onsubmit="AnchorDialog.update();return false;" action="#"> <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"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title>{#advanced_dlg.charmap_title}</title> <title>{#advanced_dlg.charmap_title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=357-20121111"></script> <script type="text/javascript" src="../../tiny_mce_popup.js?ver=358-20121205"></script>
<script type="text/javascript" src="js/charmap.js?ver=357-20121111"></script> <script type="text/javascript" src="js/charmap.js?ver=358-20121205"></script>
</head> </head>
<body id="charmap" style="display:none" role="application"> <body id="charmap" style="display:none" role="application">
<table align="center" border="0" cellspacing="0" cellpadding="2" role="presentation"> <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"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title>{#advanced_dlg.colorpicker_title}</title> <title>{#advanced_dlg.colorpicker_title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=357-20121111"></script> <script type="text/javascript" src="../../tiny_mce_popup.js?ver=358-20121205"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=357-20121111"></script> <script type="text/javascript" src="../../utils/mctabs.js?ver=358-20121205"></script>
<script type="text/javascript" src="js/color_picker.js?ver=357-20121111"></script> <script type="text/javascript" src="js/color_picker.js?ver=358-20121205"></script>
</head> </head>
<body id="colorpicker" style="display: none" role="application" aria-labelledby="app_label"> <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> <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 = s.theme_advanced_toolbar_align.toLowerCase();
a = 'mce' + t._ufirst(a); a = 'mce' + t._ufirst(a);
n = DOM.add(DOM.add(c, 'tr', {role: 'toolbar'}), 'td', {'class' : 'mceToolbar ' + a, "role":"toolbar"}); n = DOM.add(DOM.add(c, 'tr', {role: 'presentation'}), 'td', {'class' : 'mceToolbar ' + a, "role":"toolbar"});
// Create toolbar and add the controls // Create toolbar and add the controls
for (i=1; (v = s['theme_advanced_buttons' + i]); i++) { 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"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title>{#advanced_dlg.image_title}</title> <title>{#advanced_dlg.image_title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=357-20121111"></script> <script type="text/javascript" src="../../tiny_mce_popup.js?ver=358-20121205"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=357-20121111"></script> <script type="text/javascript" src="../../utils/mctabs.js?ver=358-20121205"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=357-20121111"></script> <script type="text/javascript" src="../../utils/form_utils.js?ver=358-20121205"></script>
<script type="text/javascript" src="js/image.js?ver=357-20121111"></script> <script type="text/javascript" src="js/image.js?ver=358-20121205"></script>
</head> </head>
<body id="image" style="display: none"> <body id="image" style="display: none">
<form onsubmit="ImageDialog.update();return false;" action="#"> <form onsubmit="ImageDialog.update();return false;" action="#">

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

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

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

@ -1,8 +1,8 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title>{#advanced_dlg.code_title}</title> <title>{#advanced_dlg.code_title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=357-20121111"></script> <script type="text/javascript" src="../../tiny_mce_popup.js?ver=358-20121205"></script>
<script type="text/javascript" src="js/source_editor.js?ver=357-20121111"></script> <script type="text/javascript" src="js/source_editor.js?ver=358-20121205"></script>
</head> </head>
<body onresize="resizeInputs();" style="display:none; overflow:hidden;" spellcheck="false"> <body onresize="resizeInputs();" style="display:none; overflow:hidden;" spellcheck="false">
<form name="source" onsubmit="saveContent();return false;" action="#"> <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> <head>
<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" /> <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
<title><?php _e('Rich Editor Help'); ?></title> <title><?php _e('Rich Editor Help'); ?></title>
<script type="text/javascript" src="tiny_mce_popup.js?ver=357-20121111"></script> <script type="text/javascript" src="tiny_mce_popup.js?ver=358-20121205"></script>
<?php <?php
wp_admin_css( 'wp-admin', true ); 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 * @global string $tinymce_version
*/ */
$tinymce_version = '357-23047'; $tinymce_version = '358-20121205';
/** /**
* Holds the required PHP version * Holds the required PHP version