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:
parent
54a390bea9
commit
449156f3c8
wp-includes
js/tinymce
plugins
fullscreen
inlinepopups
media
paste
wpeditimage
themes/advanced
about.htmanchor.htmcharmap.htmcolor_picker.htmeditor_template.jseditor_template_src.jsimage.htmlink.htmshortcuts.htmsource_editor.htm
tiny_mce.jswp-mce-help.php
|
@ -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=357-20121111"></script>
|
||||
<script type="text/javascript" src="../../tiny_mce.js?ver=358-20121205"></script>
|
||||
<script type="text/javascript">
|
||||
function patchCallback(settings, key) {
|
||||
if (settings[key])
|
||||
|
|
|
@ -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=357-20121111" />
|
||||
<link rel="stylesheet" type="text/css" href="skins/clearlooks2/window.css?ver=358-20121205" />
|
||||
</head>
|
||||
<body>
|
||||
|
||||
|
|
|
@ -295,30 +295,40 @@
|
|||
} else {
|
||||
src = getVal("src");
|
||||
|
||||
// YouTube *NEW*
|
||||
if (src.match(/youtu.be\/[a-z1-9.-_]+/)) {
|
||||
// YouTube Embed
|
||||
if (src.match(/youtube\.com\/embed\/\w+/)) {
|
||||
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);
|
||||
}
|
||||
} 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
|
||||
if (src.match(/youtube.com(.+)v=([^&]+)/)) {
|
||||
data.width = 425;
|
||||
data.height = 350;
|
||||
data.params.frameborder = '0';
|
||||
data.type = 'iframe';
|
||||
src = 'http://www.youtube.com/embed/' + src.match(/v=([^&]+)/)[1];
|
||||
setVal('src', src);
|
||||
setVal('media_type', data.type);
|
||||
// YouTube
|
||||
if (src.match(/youtube\.com(.+)v=([^&]+)/)) {
|
||||
data.width = 425;
|
||||
data.height = 350;
|
||||
data.params.frameborder = '0';
|
||||
data.type = 'iframe';
|
||||
src = 'http://www.youtube.com/embed/' + src.match(/v=([^&]+)/)[1];
|
||||
setVal('src', src);
|
||||
setVal('media_type', data.type);
|
||||
}
|
||||
}
|
||||
|
||||
// Google video
|
||||
if (src.match(/video.google.com(.+)docid=([^&]+)/)) {
|
||||
if (src.match(/video\.google\.com(.+)docid=([^&]+)/)) {
|
||||
data.width = 425;
|
||||
data.height = 326;
|
||||
data.type = 'flash';
|
||||
|
@ -328,7 +338,7 @@
|
|||
}
|
||||
|
||||
// Vimeo
|
||||
if (src.match(/vimeo.com\/([0-9]+)/)) {
|
||||
if (src.match(/vimeo\.com\/([0-9]+)/)) {
|
||||
data.width = 425;
|
||||
data.height = 350;
|
||||
data.params.frameborder = '0';
|
||||
|
@ -339,7 +349,7 @@
|
|||
}
|
||||
|
||||
// stream.cz
|
||||
if (src.match(/stream.cz\/((?!object).)*\/([0-9]+)/)) {
|
||||
if (src.match(/stream\.cz\/((?!object).)*\/([0-9]+)/)) {
|
||||
data.width = 425;
|
||||
data.height = 350;
|
||||
data.params.frameborder = '0';
|
||||
|
@ -350,7 +360,7 @@
|
|||
}
|
||||
|
||||
// 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.height = 350;
|
||||
data.params.frameborder = '0';
|
||||
|
|
|
@ -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=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" />
|
||||
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=358-20121205"></script>
|
||||
<script type="text/javascript" src="js/media.js?ver=358-20121205"></script>
|
||||
<script type="text/javascript" src="../../utils/mctabs.js?ver=358-20121205"></script>
|
||||
<script type="text/javascript" src="../../utils/validate.js?ver=358-20121205"></script>
|
||||
<script type="text/javascript" src="../../utils/form_utils.js?ver=358-20121205"></script>
|
||||
<script type="text/javascript" src="../../utils/editable_selects.js?ver=358-20121205"></script>
|
||||
<link href="css/media.css?ver=358-20121205" rel="stylesheet" type="text/css" />
|
||||
</head>
|
||||
<body style="display: none" role="application">
|
||||
<form onsubmit="Media.insert();return false;" action="#">
|
||||
|
|
|
@ -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=357-20121111"></script>
|
||||
<script type="text/javascript" src="js/pastetext.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=358-20121205"></script>
|
||||
</head>
|
||||
<body onresize="PasteTextDialog.resize();" style="display:none; overflow:hidden;">
|
||||
<form name="source" onsubmit="return PasteTextDialog.insert();" action="#">
|
||||
|
|
|
@ -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=357-20121111"></script>
|
||||
<script type="text/javascript" src="js/pasteword.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=358-20121205"></script>
|
||||
</head>
|
||||
<body onresize="PasteWordDialog.resize();" style="display:none; overflow:hidden;">
|
||||
<form name="source" onsubmit="return PasteWordDialog.insert();" action="#">
|
||||
|
|
|
@ -4,10 +4,10 @@
|
|||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
||||
<title></title>
|
||||
|
||||
<link rel="stylesheet" href="css/editimage.css?ver=357-20121111" type="text/css" media="all" />
|
||||
<link rel="stylesheet" href="../../../../css/buttons.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>
|
||||
<link rel="stylesheet" href="css/editimage.css?ver=358-20121205" 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=358-20121205"></script>
|
||||
<script type="text/javascript" src="../../utils/form_utils.js?ver=358-20121205"></script>
|
||||
<base target="_self" />
|
||||
</head>
|
||||
|
||||
|
|
|
@ -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=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>
|
||||
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=358-20121205"></script>
|
||||
<script type="text/javascript" src="../../utils/mctabs.js?ver=358-20121205"></script>
|
||||
<script type="text/javascript" src="js/about.js?ver=358-20121205"></script>
|
||||
</head>
|
||||
<body id="about" style="display: none">
|
||||
<div class="tabs">
|
||||
|
|
|
@ -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=357-20121111"></script>
|
||||
<script type="text/javascript" src="js/anchor.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=358-20121205"></script>
|
||||
</head>
|
||||
<body style="display: none" role="application" aria-labelledby="app_title">
|
||||
<form onsubmit="AnchorDialog.update();return false;" action="#">
|
||||
|
|
|
@ -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=357-20121111"></script>
|
||||
<script type="text/javascript" src="js/charmap.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=358-20121205"></script>
|
||||
</head>
|
||||
<body id="charmap" style="display:none" role="application">
|
||||
<table align="center" border="0" cellspacing="0" cellpadding="2" role="presentation">
|
||||
|
|
|
@ -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=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>
|
||||
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=358-20121205"></script>
|
||||
<script type="text/javascript" src="../../utils/mctabs.js?ver=358-20121205"></script>
|
||||
<script type="text/javascript" src="js/color_picker.js?ver=358-20121205"></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>
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -956,7 +956,7 @@
|
|||
a = s.theme_advanced_toolbar_align.toLowerCase();
|
||||
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
|
||||
for (i=1; (v = s['theme_advanced_buttons' + i]); i++) {
|
||||
|
|
|
@ -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=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>
|
||||
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=358-20121205"></script>
|
||||
<script type="text/javascript" src="../../utils/mctabs.js?ver=358-20121205"></script>
|
||||
<script type="text/javascript" src="../../utils/form_utils.js?ver=358-20121205"></script>
|
||||
<script type="text/javascript" src="js/image.js?ver=358-20121205"></script>
|
||||
</head>
|
||||
<body id="image" style="display: none">
|
||||
<form onsubmit="ImageDialog.update();return false;" action="#">
|
||||
|
|
|
@ -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=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>
|
||||
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=358-20121205"></script>
|
||||
<script type="text/javascript" src="../../utils/mctabs.js?ver=358-20121205"></script>
|
||||
<script type="text/javascript" src="../../utils/form_utils.js?ver=358-20121205"></script>
|
||||
<script type="text/javascript" src="../../utils/validate.js?ver=358-20121205"></script>
|
||||
<script type="text/javascript" src="js/link.js?ver=358-20121205"></script>
|
||||
</head>
|
||||
<body id="link" style="display: none">
|
||||
<form onsubmit="LinkDialog.update();return false;" action="#">
|
||||
|
|
|
@ -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=357-20121111"></script>
|
||||
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=358-20121205"></script>
|
||||
<script type="text/javascript">tinyMCEPopup.requireLangPack();</script>
|
||||
</head>
|
||||
<body id="content">
|
||||
|
|
|
@ -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=357-20121111"></script>
|
||||
<script type="text/javascript" src="js/source_editor.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=358-20121205"></script>
|
||||
</head>
|
||||
<body onresize="resizeInputs();" style="display:none; overflow:hidden;" spellcheck="false">
|
||||
<form name="source" onsubmit="saveContent();return false;" action="#">
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -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=357-20121111"></script>
|
||||
<script type="text/javascript" src="tiny_mce_popup.js?ver=358-20121205"></script>
|
||||
<?php
|
||||
wp_admin_css( 'wp-admin', true );
|
||||
?>
|
||||
|
|
|
@ -18,7 +18,7 @@ $wp_db_version = 22441;
|
|||
*
|
||||
* @global string $tinymce_version
|
||||
*/
|
||||
$tinymce_version = '357-23047';
|
||||
$tinymce_version = '358-20121205';
|
||||
|
||||
/**
|
||||
* Holds the required PHP version
|
||||
|
|
Loading…
Reference in New Issue