Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-27 06:42:56 +02:00
Code Issues Projects Releases Wiki Activity

Update TinyMCE to 3.4.8, fixes #19969, fixes #19936, fixes #19741

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@19830 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2012-02-04 22:23:27 +00:00
parent 56633093fd
commit 3a5832e1f2
31 changed files with 200 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-includes/class-wp-editor.php
View File

@ -311,6 +311,7 @@ final class _WP_Editors {
'paste_remove_spans' => true,
'paste_strip_class_attributes' => 'all',
'paste_text_use_dialog' => true,
'spellchecker_rpc_url' => self::$baseurl . '/plugins/spellchecker/rpc.php',
'extended_valid_elements' => 'article[*],aside[*],audio[*],canvas[*],command[*],datalist[*],details[*],embed[*],figcaption[*],figure[*],footer[*],header[*],hgroup[*],keygen[*],mark[*],meter[*],nav[*],output[*],progress[*],section[*],source[*],summary,time[*],video[*],wbr',
'wpeditimage_disable_captions' => $no_captions,
'wp_fullscreen_content_css' => self::$baseurl . '/plugins/wpfullscreen/css/wp-fullscreen.css',

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=345-20110908"></script>
<script type="text/javascript" src="../../tiny_mce.js?ver=348-20120204"></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=345-20110908" />
<link rel="stylesheet" type="text/css" href="skins/clearlooks2/window.css?ver=348-20120204" />
</head>
<body>

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

File diff suppressed because one or more lines are too long

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

@ -8,6 +8,33 @@
return document.getElementById(id);
}
function clone(obj) {
var i, len, copy, attr;
if (null == obj || "object" != typeof obj)
return obj;
// Handle Array
if ('length' in obj) {
copy = [];
for (i = 0, len = obj.length; i < len; ++i) {
copy[i] = clone(obj[i]);
}
return copy;
}
// Handle Object
copy = {};
for (attr in obj) {
if (obj.hasOwnProperty(attr))
copy[attr] = clone(obj[attr]);
}
return copy;
}
function getVal(id) {
var elm = get(id);
@ -21,7 +48,7 @@
}
function setVal(id, value, name) {
if (typeof(value) != 'undefined') {
if (typeof(value) != 'undefined' && value != null) {
var elm = get(id);
if (elm.nodeName == "SELECT")
@ -39,9 +66,9 @@
window.Media = {
init : function() {
var html, editor;
var html, editor, self = this;
this.editor = editor = tinyMCEPopup.editor;
self.editor = editor = tinyMCEPopup.editor;
// Setup file browsers and color pickers
get('filebrowsercontainer').innerHTML = getBrowserHTML('filebrowser','src','media','media');
@ -53,7 +80,7 @@
get('audio_altsource2_filebrowser').innerHTML = getBrowserHTML('audio_filebrowser_altsource2','audio_altsource2','media','media');
get('video_poster_filebrowser').innerHTML = getBrowserHTML('filebrowser_poster','video_poster','media','image');
html = this.getMediaListHTML('medialist', 'src', 'media', 'media');
html = self.getMediaListHTML('medialist', 'src', 'media', 'media');
if (html == "")
get("linklistrow").style.display = 'none';
else
@ -77,9 +104,14 @@
if (isVisible('filebrowser_poster'))
get('video_poster').style.width = '220px';
this.data = tinyMCEPopup.getWindowArg('data');
this.dataToForm();
this.preview();
editor.dom.setOuterHTML(get('media_type'), self.getMediaTypeHTML(editor));
self.setDefaultDialogSettings(editor);
self.data = clone(tinyMCEPopup.getWindowArg('data'));
self.dataToForm();
self.preview();
updateColor('bgcolor_pick', 'bgcolor');
},
insert : function() {
@ -97,7 +129,7 @@
},
moveStates : function(to_form, field) {
var data = this.data, editor = this.editor, data = this.data,
var data = this.data, editor = this.editor,
mediaPlugin = editor.plugins.media, ext, src, typeInfo, defaultStates, src;
defaultStates = {
@ -144,14 +176,14 @@
formItemName = type == 'global' ? name : type + '_' + name;
if (type == 'global')
list = data;
else if (type == 'video' || type == 'audio') {
list = data;
else if (type == 'video' || type == 'audio') {
list = data.video.attrs;
if (!list && !to_form)
data.video.attrs = list = {};
data.video.attrs = list = {};
} else
list = data.params;
list = data.params;
if (list) {
if (to_form) {
@ -209,6 +241,7 @@
get('shockwave_options').style.display = 'none';
get('windowsmedia_options').style.display = 'none';
get('realmedia_options').style.display = 'none';
get('embeddedaudio_options').style.display = 'none';
if (get(data.type + '_options'))
get(data.type + '_options').style.display = 'block';
@ -222,6 +255,7 @@
setOptions('realmedia', 'autostart,loop,autogotourl,center,imagestatus,maintainaspect,nojava,prefetch,shuffle,console,controls,numloop,scriptcallbacks');
setOptions('video', 'poster,autoplay,loop,muted,preload,controls');
setOptions('audio', 'autoplay,loop,preload,controls');
setOptions('embeddedaudio', 'autoplay,loop,controls');
setOptions('global', 'id,name,vspace,hspace,bgcolor,align,width,height');
if (to_form) {
@ -252,7 +286,7 @@
if (data.type == 'flash') {
tinymce.each(editor.getParam('flash_video_player_flashvars', {url : '$url', poster : '$poster'}), function(value, name) {
if (value == '$url')
data.params.src = parseQueryParams(data.params.flashvars)[name] || data.params.src;
data.params.src = parseQueryParams(data.params.flashvars)[name] || data.params.src || '';
});
}
@ -260,7 +294,18 @@
}
} else {
src = getVal("src");
// 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;
@ -331,7 +376,7 @@
this.panel = 'source';
} else {
if (this.panel == 'source') {
this.data = this.editor.plugins.media.htmlToData(getVal('source'));
this.data = clone(this.editor.plugins.media.htmlToData(getVal('source')));
this.dataToForm();
this.panel = '';
}
@ -379,6 +424,36 @@
}
return "";
},
getMediaTypeHTML : function(editor) {
function option(media_type){
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("iframe");
if (editor.getParam('media_embedded_audio', false)) {
html += option('embeddedaudio');
}
html += '</select>';
return html;
},
setDefaultDialogSettings : function(editor) {
var defaultDialogSettings = editor.getParam("media_dialog_defaults", {});
tinymce.each(defaultDialogSettings, function(v, k) {
setVal(k, v);
});
}
};
@ -386,4 +461,4 @@
tinyMCEPopup.onInit.add(function() {
Media.init();
});
})();
})();

63
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=345-20110908"></script>
<script type="text/javascript" src="js/media.js?ver=345-20110908"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=345-20110908"></script>
<script type="text/javascript" src="../../utils/validate.js?ver=345-20110908"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=345-20110908"></script>
<script type="text/javascript" src="../../utils/editable_selects.js?ver=345-20110908"></script>
<link href="css/media.css?ver=345-20110908" rel="stylesheet" type="text/css" />
<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" />
</head>
<body style="display: none" role="application">
<form onsubmit="Media.insert();return false;" action="#">
@ -29,16 +29,7 @@
<tr>
<td><label for="media_type">{#media_dlg.type}</label></td>
<td>
<select id="media_type" name="media_type" onchange="Media.formToData('type');">
<option value="video">HTML5 Video</option>
<option value="audio">HTML5 Audio</option>
<option value="flash">Flash</option>
<option value="quicktime">QuickTime</option>
<option value="shockwave">Shockwave</option>
<option value="windowsmedia">Windows Media</option>
<option value="realmedia">Real Media</option>
<option value="iframe">Iframe</option>
</select>
<select id="media_type"></select>
</td>
</tr>
<tr>
@ -214,6 +205,41 @@
</table>
</fieldset>
<fieldset id="embeddedaudio_options">
<legend>{#media_dlg.embedded_audio_options}</legend>
<table role="presentation" border="0" cellpadding="4" cellspacing="0">
<tr>
<td>
<table role="presentation" border="0" cellpadding="0" cellspacing="0">
<tr>
<td><input type="checkbox" class="checkbox" id="embeddedaudio_autoplay" name="audio_autoplay" onchange="Media.formToData();" /></td>
<td><label for="audio_autoplay">{#media_dlg.play}</label></td>
</tr>
</table>
</td>
<td>
<table role="presentation" border="0" cellpadding="0" cellspacing="0">
<tr>
<td><input type="checkbox" class="checkbox" id="embeddedaudio_loop" name="audio_loop" onchange="Media.formToData();" /></td>
<td><label for="audio_loop">{#media_dlg.loop}</label></td>
</tr>
</table>
</td>
<td>
<table role="presentation" border="0" cellpadding="0" cellspacing="0">
<tr>
<td><input type="checkbox" class="checkbox" id="embeddedaudio_controls" name="audio_controls" onchange="Media.formToData();" /></td>
<td><label for="audio_controls">{#media_dlg.controls}</label></td>
</tr>
</table>
</td>
</tr>
</table>
</fieldset>
<fieldset id="audio_options">
<legend>{#media_dlg.html5_audio_options}</legend>
@ -246,7 +272,7 @@
<td><label for="audio_preload">{#media_dlg.preload}</label></td>
<td>
<select id="audio_preload" name="audio_preload" onchange="Media.formToData();">
<option value="none">{#media_dlg.preload_none}</option>
<option value="none">{#media_dlg.preload_none}</option>
<option value="metadata">{#media_dlg.preload_metadata}</option>
<option value="auto">{#media_dlg.preload_auto}</option>
</select>
@ -286,7 +312,6 @@
</table>
</fieldset>
<fieldset id="flash_options">
<legend>{#media_dlg.flash_options}</legend>

BIN
wp-includes/js/tinymce/plugins/media/moxieplayer.swf
View File

Binary file not shown.

21
wp-includes/js/tinymce/plugins/paste/blank.htm
View File

@ -1,21 +0,0 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>blank_page</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link href="css/blank.css?ver=3223_1087" rel="stylesheet" type="text/css" />
<script type="text/javascript">
function init() {
if (parent.tinymce.isIE)
document.body.contentEditable = true;
else
document.designMode = 'on';
parent.initIframe(document);
window.focus();
}
</script>
</head>
<body onload="init();">
</body>
</html>

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

File diff suppressed because one or more lines are too long

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=345-20110908"></script>
<script type="text/javascript" src="js/pastetext.js?ver=345-20110908"></script>
<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>
</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=345-20110908"></script>
<script type="text/javascript" src="js/pasteword.js?ver=345-20110908"></script>
<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>
</head>
<body onresize="PasteWordDialog.resize();" style="display:none; overflow:hidden;">
<form name="source" onsubmit="return PasteWordDialog.insert();" action="#">

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

File diff suppressed because one or more lines are too long

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=345-20110908"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=345-20110908"></script>
<script type="text/javascript" src="js/about.js?ver=345-20110908"></script>
<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>
</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=345-20110908"></script>
<script type="text/javascript" src="js/anchor.js?ver=345-20110908"></script>
<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>
</head>
<body style="display: none" role="application" aria-labelledby="app_title">
<form onsubmit="AnchorDialog.update();return false;" action="#">

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

@ -2,10 +2,10 @@
<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=345-20110908"></script>
<script type="text/javascript" src="js/charmap.js?ver=345-20110908"></script>
<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>
</head>
<body id="charmap" style="display:none">
<body id="charmap" style="display:none" role="application">
<table align="center" border="0" cellspacing="0" cellpadding="2" role="presentation">
<tr>
<td colspan="2" class="title" ><label for="charmapView" id="charmap_label">{#advanced_dlg.charmap_title}</label></td>
@ -46,6 +46,10 @@
</table>
</td>
</tr>
<tr>
<td colspan="2" id="charmap_usage">{#advanced_dlg.charmap_usage}</td>
</tr>
</table>
</body>
</html>

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=345-20110908"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=345-20110908"></script>
<script type="text/javascript" src="js/color_picker.js?ver=345-20110908"></script>
<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>
</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

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=345-20110908"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=345-20110908"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=345-20110908"></script>
<script type="text/javascript" src="js/image.js?ver=345-20110908"></script>
<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>
</head>
<body id="image" style="display: none">
<form onsubmit="ImageDialog.update();return false;" action="#">

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

@ -30,9 +30,10 @@ var AnchorDialog = {
ed.selection.collapse(1);
elm = ed.dom.getParent(ed.selection.getNode(), 'A');
if (elm)
if (elm) {
elm.setAttribute('name', name);
elm.name = name;
else
} else
ed.execCommand('mceInsertContent', 0, ed.dom.createHTML('a', {name : name, 'class' : 'mceItemAnchor'}, ''));
tinyMCEPopup.close();

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

@ -281,13 +281,21 @@ tinyMCEPopup.onInit.add(function() {
function addKeyboardNavigation(){
var tableElm, cells, settings;
cells = tinyMCEPopup.dom.select(".charmaplink", "charmapgroup");
cells = tinyMCEPopup.dom.select("a.charmaplink", "charmapgroup");
settings ={
root: "charmapgroup",
items: cells
};
cells[0].tabindex=0;
tinyMCEPopup.dom.addClass(cells[0], "mceFocus");
if (tinymce.isGecko) {
cells[0].focus();
} else {
setTimeout(function(){
cells[0].focus();
}, 100);
}
tinyMCEPopup.editor.windowManager.createInstance('tinymce.ui.KeyboardNavigation', settings, tinyMCEPopup.dom);
}
@ -306,7 +314,7 @@ function renderCharMapHTML() {
previewCharFn = 'previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');';
html += ''
+ '<td class="charmap">'
+ '<a class="charmaplink" role="button" onmouseover="'+previewCharFn+'" onfocus="'+previewCharFn+'" href="javascript:void(0)" onclick="insertChar(\'' + charmap[i][1].substring(2,charmap[i][1].length-1) + '\');" onclick="return false;" onmousedown="return false;" title="' + charmap[i][3] + '">'
+ '<a class="charmaplink" role="button" onmouseover="'+previewCharFn+'" onfocus="'+previewCharFn+'" href="javascript:void(0)" onclick="insertChar(\'' + charmap[i][1].substring(2,charmap[i][1].length-1) + '\');" onclick="return false;" onmousedown="return false;" title="' + charmap[i][3] + ' '+ tinyMCEPopup.editor.translate("advanced_dlg.charmap_usage")+'">'
+ charmap[i][1]
+ '</a></td>';
if ((cols+1) % charsPerRow == 0)

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

@ -1,6 +1,6 @@
tinyMCEPopup.requireLangPack();
var detail = 50, strhex = "0123456789ABCDEF", i, isMouseDown = false, isMouseOver = false;
var detail = 50, strhex = "0123456789abcdef", i, isMouseDown = false, isMouseOver = false;
var colors = [
"#000000","#000033","#000066","#000099","#0000cc","#0000ff","#330000","#330033",
@ -266,10 +266,10 @@ function dechex(n) {
}
function computeColor(e) {
var x, y, partWidth, partDetail, imHeight, r, g, b, coef, i, finalCoef, finalR, finalG, finalB;
var x, y, partWidth, partDetail, imHeight, r, g, b, coef, i, finalCoef, finalR, finalG, finalB, pos = tinyMCEPopup.dom.getPos(e.target);
x = e.offsetX ? e.offsetX : (e.target ? e.clientX - e.target.x : 0);
y = e.offsetY ? e.offsetY : (e.target ? e.clientY - e.target.y : 0);
x = e.offsetX ? e.offsetX : (e.target ? e.clientX - pos.x : 0);
y = e.offsetY ? e.offsetY : (e.target ? e.clientY - pos.y : 0);
partWidth = document.getElementById('colors').width / 6;
partDetail = detail / 2;

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=345-20110908"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=345-20110908"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=345-20110908"></script>
<script type="text/javascript" src="../../utils/validate.js?ver=345-20110908"></script>
<script type="text/javascript" src="js/link.js?ver=345-20110908"></script>
<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>
</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=345-20110908"></script>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=348-20120204"></script>
<script type="text/javascript">tinyMCEPopup.requireLangPack();</script>
</head>
<body id="content">

3
wp-includes/js/tinymce/themes/advanced/skins/default/content.css
View File

@ -13,7 +13,7 @@ a.mceItemAnchor {display:inline-block; -webkit-user-select:all; -webkit-user-mod
span.mceItemNbsp {background: #DDD}
td.mceSelected, th.mceSelected {background-color:#3399ff !important}
img {border:0;}
table {cursor:default}
table, img, hr, .mceItemAnchor {cursor:default}
table td, table th {cursor:text}
ins {border-bottom:1px solid green; text-decoration: none; color:green}
del {color:red; text-decoration:line-through}
@ -45,5 +45,6 @@ font[face=mceinline] {font-family:inherit !important}
.mceItemRealMedia {background-image:url(../../img/realmedia.gif)}
.mceItemVideo {background-image:url(../../img/video.gif)}
.mceItemAudio {background-image:url(../../img/video.gif)}
.mceItemEmbeddedAudio {background-image:url(../../img/video.gif)}
.mceItemIframe {background-image:url(../../img/iframe.gif)}
.mcePageBreak {display:block;border:0;width:100%;height:12px;border-top:1px dotted #ccc;margin-top:15px;background:#fff url(../../img/pagebreak.gif) no-repeat center top;}

2
wp-includes/js/tinymce/themes/advanced/skins/highcontrast/content.css
View File

@ -11,7 +11,7 @@ a.mceItemAnchor {display:inline-block; width:11px !important; height:11px !impo
span.mceItemNbsp {background: #DDD}
td.mceSelected, th.mceSelected {background-color:#3399ff !important}
img {border:0;}
table {cursor:default}
table, img, hr, .mceItemAnchor {cursor:default}
table td, table th {cursor:text}
ins {border-bottom:1px solid green; text-decoration: none; color:green}
del {color:red; text-decoration:line-through}

2
wp-includes/js/tinymce/themes/advanced/skins/o2k7/content.css
View File

@ -12,7 +12,7 @@ a.mceItemAnchor {display:inline-block; width:11px !important; height:11px !impo
span.mceItemNbsp {background: #DDD}
td.mceSelected, th.mceSelected {background-color:#3399ff !important}
img {border:0;}
table {cursor:default}
table, img, hr, .mceItemAnchor {cursor:default}
table td, table th {cursor:text}
ins {border-bottom:1px solid green; text-decoration: none; color:green}
del {color:red; text-decoration:line-through}

2
wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css
View File

@ -17,7 +17,7 @@ a.mceItemAnchor {display:inline-block; -webkit-user-select:all; -webkit-user-mod
span.mceItemNbsp {background: #DDD}
td.mceSelected, th.mceSelected {background-color:#3399ff !important}
img {border:0;}
table {cursor:default}
table, img, hr, .mceItemAnchor {cursor:default}
table td, table th {cursor:text}
ins {border-bottom:1px solid green; text-decoration: none; color:green}
del {color:red; text-decoration:line-through}

8
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=345-20110908"></script>
<script type="text/javascript" src="js/source_editor.js?ver=345-20110908"></script>
<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>
</head>
<body onresize="resizeInputs();" style="display:none; overflow:hidden;">
<form name="source" onsubmit="saveContent();return false;" action="#">
@ -18,11 +18,11 @@
<div class="mceActionPanel">
<div style="float: left">
<input type="button" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" id="cancel" />
<input type="button" role="button" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" id="cancel" />
</div>
<div style="float: right">
<input type="submit" name="insert" value="{#update}" id="insert" />
<input type="submit" role="button" name="insert" value="{#update}" id="insert" />
</div>
</div>
</form>

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

File diff suppressed because one or more lines are too long

BIN
wp-includes/js/tinymce/wp-tinymce.js.gz
View File

Binary file not shown.

2
wp-includes/version.php
View File

@ -18,7 +18,7 @@ $wp_db_version = 19799;
*
* @global string $tinymce_version
*/
$tinymce_version = '345-20111127';
$tinymce_version = '348-20120204';
/**
* Holds the cache manifest version