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

Update TinyMCE to 3.4.9, fixes #20239, fixes #19717

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@20177 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2012-03-15 00:47:06 +00:00
parent 24cbb5d9c6
commit 5f196c6e2d
16 changed files with 51 additions and 45 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=348-20120204"></script>
<script type="text/javascript" src="../../tiny_mce.js?ver=349-20120314"></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=348-20120204" />
<link rel="stylesheet" type="text/css" href="skins/clearlooks2/window.css?ver=349-20120314" />
</head>
<body>

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

@ -427,24 +427,30 @@
},
getMediaTypeHTML : function(editor) {
function option(media_type){
function option(media_type, element) {
if (!editor.schema.getElementRule(element || media_type)) {
return '';
}
return '<option value="'+media_type+'">'+tinyMCEPopup.editor.translate("media_dlg."+media_type)+'</option>'
}
var html = "";
html += '<select id="media_type" name="media_type" onchange="Media.formToData(\'type\');">';
html += option("video");
html += option("audio");
html += option("flash");
html += option("quicktime");
html += option("shockwave");
html += option("windowsmedia");
html += option("realmedia");
html += option("flash", "object");
html += option("quicktime", "object");
html += option("shockwave", "object");
html += option("windowsmedia", "object");
html += option("realmedia", "object");
html += option("iframe");
if (editor.getParam('media_embedded_audio', false)) {
html += option('embeddedaudio');
html += option('embeddedaudio', "object");
}
html += '</select>';
return html;
},

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=348-20120204"></script>
<script type="text/javascript" src="js/media.js?ver=348-20120204"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=348-20120204"></script>
<script type="text/javascript" src="../../utils/validate.js?ver=348-20120204"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=348-20120204"></script>
<script type="text/javascript" src="../../utils/editable_selects.js?ver=348-20120204"></script>
<link href="css/media.css?ver=348-20120204" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=349-20120314"></script>
<script type="text/javascript" src="js/media.js?ver=349-20120314"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=349-20120314"></script>
<script type="text/javascript" src="../../utils/validate.js?ver=349-20120314"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=349-20120314"></script>
<script type="text/javascript" src="../../utils/editable_selects.js?ver=349-20120314"></script>
<link href="css/media.css?ver=349-20120314" rel="stylesheet" type="text/css" />
</head>
<body style="display: none" role="application">
<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">
<head>
<title>{#paste.paste_text_desc}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=348-20120204"></script>
<script type="text/javascript" src="js/pastetext.js?ver=348-20120204"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=349-20120314"></script>
<script type="text/javascript" src="js/pastetext.js?ver=349-20120314"></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=348-20120204"></script>
<script type="text/javascript" src="js/pasteword.js?ver=348-20120204"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=349-20120314"></script>
<script type="text/javascript" src="js/pasteword.js?ver=349-20120314"></script>
</head>
<body onresize="PasteWordDialog.resize();" style="display:none; overflow:hidden;">
<form name="source" onsubmit="return PasteWordDialog.insert();" action="#">

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=348-20120204"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=348-20120204"></script>
<script type="text/javascript" src="js/about.js?ver=348-20120204"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=349-20120314"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=349-20120314"></script>
<script type="text/javascript" src="js/about.js?ver=349-20120314"></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=348-20120204"></script>
<script type="text/javascript" src="js/anchor.js?ver=348-20120204"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=349-20120314"></script>
<script type="text/javascript" src="js/anchor.js?ver=349-20120314"></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=348-20120204"></script>
<script type="text/javascript" src="js/charmap.js?ver=348-20120204"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=349-20120314"></script>
<script type="text/javascript" src="js/charmap.js?ver=349-20120314"></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=348-20120204"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=348-20120204"></script>
<script type="text/javascript" src="js/color_picker.js?ver=348-20120204"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=349-20120314"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=349-20120314"></script>
<script type="text/javascript" src="js/color_picker.js?ver=349-20120314"></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>

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=348-20120204"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=348-20120204"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=348-20120204"></script>
<script type="text/javascript" src="js/image.js?ver=348-20120204"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=349-20120314"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=349-20120314"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=349-20120314"></script>
<script type="text/javascript" src="js/image.js?ver=349-20120314"></script>
</head>
<body id="image" style="display: none">
<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">
<head>
<title>{#advanced_dlg.link_title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=348-20120204"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=348-20120204"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=348-20120204"></script>
<script type="text/javascript" src="../../utils/validate.js?ver=348-20120204"></script>
<script type="text/javascript" src="js/link.js?ver=348-20120204"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=349-20120314"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=349-20120314"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=349-20120314"></script>
<script type="text/javascript" src="../../utils/validate.js?ver=349-20120314"></script>
<script type="text/javascript" src="js/link.js?ver=349-20120314"></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=348-20120204"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=349-20120314"></script>
<script type="text/javascript">tinyMCEPopup.requireLangPack();</script>
</head>
<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">
<head>
<title>{#advanced_dlg.code_title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=348-20120204"></script>
<script type="text/javascript" src="js/source_editor.js?ver=348-20120204"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=349-20120314"></script>
<script type="text/javascript" src="js/source_editor.js?ver=349-20120314"></script>
</head>
<body onresize="resizeInputs();" style="display:none; overflow:hidden;">
<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/version.php
View File

@ -18,7 +18,7 @@ $wp_db_version = 20148;
*
* @global string $tinymce_version
*/
$tinymce_version = '348-20175';
$tinymce_version = '349-20175';
/**
* Holds the cache manifest version