vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-13 05:10:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upgrade to TinyMCE 3.5.8, fixes #22755

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@23090 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz
2012-12-06 04:50:31 +00:00
parent d801545ff6
commit b0cd25962e
20 changed files with 71 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm
+1 -1
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=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])
wp-includes/js/tinymce/plugins/inlinepopups/template.htm
+1 -1
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=357-20121111" />
<link rel="stylesheet" type="text/css" href="skins/clearlooks2/window.css?ver=358-20121205" />
</head>
<body>
wp-includes/js/tinymce/plugins/media/js/media.js
+27 -17
View File
@@ -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';
wp-includes/js/tinymce/plugins/media/media.htm
+7 -7
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=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="#">
wp-includes/js/tinymce/plugins/paste/pastetext.htm
+2 -2
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=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="#">
wp-includes/js/tinymce/plugins/paste/pasteword.htm
+2 -2
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=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="#">
wp-includes/js/tinymce/plugins/wpeditimage/editimage.html
+4 -4
View File
@@ -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>