golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

TinyMCE 3.1.0.1 from azaozz. fixes #7153 #7148 #7128 

git-svn-id: http://svn.automattic.com/wordpress/trunk@8127 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-06-19 16:55:50 +00:00
parent f90fa97fb2
commit 9482b05698
21 changed files with 104 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
wp-admin/gears-manifest.php
View File

@ -63,7 +63,7 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' );
?> ?>
{ {
"betaManifestVersion" : 1, "betaManifestVersion" : 1,
"version" : "<?php echo $man_version; ?>_20080613", "version" : "<?php echo $man_version; ?>_20080618",
"entries" : [ "entries" : [
<?php echo $defaults; ?> <?php echo $defaults; ?>
@ -111,50 +111,50 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' );
{ "url" : "../wp-includes/js/thickbox/tb-close.png" }, { "url" : "../wp-includes/js/thickbox/tb-close.png" },
{ "url" : "../wp-includes/js/swfupload/swfupload_f9.swf" }, { "url" : "../wp-includes/js/swfupload/swfupload_f9.swf" },
{ "url" : "../wp-includes/js/tinymce/tiny_mce_popup.js?ver=3091" }, { "url" : "../wp-includes/js/tinymce/tiny_mce_popup.js?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/utils/mctabs.js?ver=3091" }, { "url" : "../wp-includes/js/tinymce/utils/mctabs.js?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/utils/validate.js?ver=3091" }, { "url" : "../wp-includes/js/tinymce/utils/validate.js?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/utils/form_utils.js?ver=3091" }, { "url" : "../wp-includes/js/tinymce/utils/form_utils.js?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/utils/editable_selects.js?ver=3091" }, { "url" : "../wp-includes/js/tinymce/utils/editable_selects.js?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/paste/js/pasteword.js?ver=3091" }, { "url" : "../wp-includes/js/tinymce/plugins/paste/js/pasteword.js?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/paste/js/pastetext.js?ver=3091" }, { "url" : "../wp-includes/js/tinymce/plugins/paste/js/pastetext.js?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/media/js/media.js?ver=3091" }, { "url" : "../wp-includes/js/tinymce/plugins/media/js/media.js?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/color_picker.js?ver=3091" }, { "url" : "../wp-includes/js/tinymce/themes/advanced/js/color_picker.js?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/charmap.js?ver=3091" }, { "url" : "../wp-includes/js/tinymce/themes/advanced/js/charmap.js?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/image.js?ver=3091" }, { "url" : "../wp-includes/js/tinymce/themes/advanced/js/image.js?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/link.js?ver=3091" }, { "url" : "../wp-includes/js/tinymce/themes/advanced/js/link.js?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js?ver=3091" }, { "url" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js?ver=3091" }, { "url" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=3091" }, { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/source_editor.htm?ver=3091" }, { "url" : "../wp-includes/js/tinymce/themes/advanced/source_editor.htm?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/anchor.htm?ver=3091" }, { "url" : "../wp-includes/js/tinymce/themes/advanced/anchor.htm?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/image.htm?ver=3091" }, { "url" : "../wp-includes/js/tinymce/themes/advanced/image.htm?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/link.htm?ver=3091" }, { "url" : "../wp-includes/js/tinymce/themes/advanced/link.htm?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/color_picker.htm?ver=3091" }, { "url" : "../wp-includes/js/tinymce/themes/advanced/color_picker.htm?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/charmap.htm?ver=3091" }, { "url" : "../wp-includes/js/tinymce/themes/advanced/charmap.htm?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/media/media.htm?ver=3091" }, { "url" : "../wp-includes/js/tinymce/plugins/media/media.htm?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/paste/pasteword.htm?ver=3091" }, { "url" : "../wp-includes/js/tinymce/plugins/paste/pasteword.htm?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/paste/blank.htm?ver=3091" }, { "url" : "../wp-includes/js/tinymce/plugins/paste/blank.htm?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/paste/pastetext.htm?ver=3091" }, { "url" : "../wp-includes/js/tinymce/plugins/paste/pastetext.htm?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm?ver=3091" }, { "url" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=3091" }, { "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=3091" }, { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/wp-mce-help.php?ver=3091" }, { "url" : "../wp-includes/js/tinymce/wp-mce-help.php?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css?ver=3091" }, { "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css?ver=3091" }, { "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css?ver=3091" }, { "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css?ver=3091" }, { "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/spellchecker/css/content.css?ver=3091" }, { "url" : "../wp-includes/js/tinymce/plugins/spellchecker/css/content.css?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/css/content.css?ver=3091" }, { "url" : "../wp-includes/js/tinymce/plugins/wordpress/css/content.css?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/media/css/content.css?ver=3091" }, { "url" : "../wp-includes/js/tinymce/plugins/media/css/content.css?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/media/css/media.css?ver=3091" }, { "url" : "../wp-includes/js/tinymce/plugins/media/css/media.css?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=3091" }, { "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=3091" }, { "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=3091" }, { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css?ver=3091" }, { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/wordpress.css?ver=3091" }, { "url" : "../wp-includes/js/tinymce/wordpress.css?ver=3101" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/icons.gif" }, { "url" : "../wp-includes/js/tinymce/themes/advanced/img/icons.gif" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/colorpicker.jpg" }, { "url" : "../wp-includes/js/tinymce/themes/advanced/img/colorpicker.jpg" },

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

@ -3,14 +3,14 @@
<head> <head>
<title></title> <title></title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<script type="text/javascript" src="../../tiny_mce.js?ver=3091"></script> <script type="text/javascript" src="../../tiny_mce.js?ver=3101"></script>
<script type="text/javascript"> <script type="text/javascript">
function patchCallback(settings, key) { function patchCallback(settings, key) {
if (settings[key]) if (settings[key])
settings[key] = "window.opener." + settings[key]; settings[key] = "window.opener." + settings[key];
} }
var settings = {}, paSe = window.opener.tinyMCE.activeEditor.settings; var settings = {}, paSe = window.opener.tinyMCE.activeEditor.settings, oeID = window.opener.tinyMCE.activeEditor.id;
// Clone array // Clone array
for (var n in paSe) for (var n in paSe)
@ -41,13 +41,13 @@
settings['ask'] = false; settings['ask'] = false;
settings['document_base_url'] = window.opener.tinyMCE.activeEditor.documentBaseURI.getURI(); settings['document_base_url'] = window.opener.tinyMCE.activeEditor.documentBaseURI.getURI();
settings['fullscreen_is_enabled'] = true; settings['fullscreen_is_enabled'] = true;
settings['fullscreen_editor_id'] = window.opener.tinyMCE.activeEditor.id; settings['fullscreen_editor_id'] = oeID;
settings['theme_advanced_resizing'] = false; settings['theme_advanced_resizing'] = false;
settings['strict_loading_mode'] = true; settings['strict_loading_mode'] = true;
settings.save_onsavecallback = function() { settings.save_onsavecallback = function() {
window.opener.tinyMCE.activeEditor.setContent(tinyMCE.get('fullscreenarea').getContent({format : 'raw'}), {format : 'raw'}); window.opener.tinyMCE.get(oeID).setContent(tinyMCE.get('fullscreenarea').getContent({format : 'raw'}), {format : 'raw'});
window.opener.tinyMCE.activeEditor.execCommand('mceSave'); window.opener.tinyMCE.get(oeID).execCommand('mceSave');
window.close(); window.close();
}; };
@ -56,7 +56,7 @@
} }
function moveContent() { function moveContent() {
window.opener.tinyMCE.activeEditor.setContent(tinyMCE.activeEditor.getContent()); window.opener.tinyMCE.get(oeID).setContent(tinyMCE.activeEditor.getContent());
} }
function closeFullscreen() { function closeFullscreen() {
@ -78,7 +78,7 @@
function render() { function render() {
var e = document.getElementById('fullscreenarea'), vp, ed, ow, oh, dom = tinymce.DOM; var e = document.getElementById('fullscreenarea'), vp, ed, ow, oh, dom = tinymce.DOM;
e.value = window.opener.tinyMCE.activeEditor.getContent(); e.value = window.opener.tinyMCE.get(oeID).getContent();
vp = dom.getViewPort(); vp = dom.getViewPort();
settings.width = vp.w; settings.width = vp.w;

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=3091" /> <link rel="stylesheet" type="text/css" href="skins/clearlooks2/window.css?ver=3101" />
</head> </head>
<body> <body>

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

File diff suppressed because one or more lines are too long

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=3091"></script> <script type="text/javascript" src="../../tiny_mce_popup.js?ver=3101"></script>
<script type="text/javascript" src="js/media.js?ver=3091"></script> <script type="text/javascript" src="js/media.js?ver=3101"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=3091"></script> <script type="text/javascript" src="../../utils/mctabs.js?ver=3101"></script>
<script type="text/javascript" src="../../utils/validate.js?ver=3091"></script> <script type="text/javascript" src="../../utils/validate.js?ver=3101"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=3091"></script> <script type="text/javascript" src="../../utils/form_utils.js?ver=3101"></script>
<script type="text/javascript" src="../../utils/editable_selects.js?ver=3091"></script> <script type="text/javascript" src="../../utils/editable_selects.js?ver=3101"></script>
<link href="css/media.css?ver=3091" rel="stylesheet" type="text/css" /> <link href="css/media.css?ver=3101" rel="stylesheet" type="text/css" />
<base target="_self" /> <base target="_self" />
</head> </head>
<body style="display: none"> <body style="display: none">

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

@ -2,7 +2,7 @@
<head> <head>
<title>blank_page</title> <title>blank_page</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link href="css/blank.css?ver=3091" rel="stylesheet" type="text/css" /> <link href="css/blank.css?ver=3101" rel="stylesheet" type="text/css" />
<base target="_self" /> <base target="_self" />
<script type="text/javascript"> <script type="text/javascript">
function init() { function init() {

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

@ -2,8 +2,8 @@
<head> <head>
<title>{#paste.paste_text_desc}</title> <title>{#paste.paste_text_desc}</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=3091"></script> <script type="text/javascript" src="../../tiny_mce_popup.js?ver=3101"></script>
<script type="text/javascript" src="js/pastetext.js?ver=3091"></script> <script type="text/javascript" src="js/pastetext.js?ver=3101"></script>
<base target="_self" /> <base target="_self" />
</head> </head>
<body onresize="resizeInputs();" style="display:none; overflow:hidden;"> <body onresize="resizeInputs();" style="display:none; overflow:hidden;">

6
wp-includes/js/tinymce/plugins/paste/pasteword.htm
View File

@ -2,9 +2,9 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>{#paste.paste_word_desc}</title> <title>{#paste.paste_word_desc}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=3091"></script> <script type="text/javascript" src="../../tiny_mce_popup.js?ver=3101"></script>
<script type="text/javascript" src="js/pasteword.js?ver=3091"></script> <script type="text/javascript" src="js/pasteword.js?ver=3101"></script>
<link href="css/pasteword.css?ver=3091" rel="stylesheet" type="text/css" /> <link href="css/pasteword.css?ver=3101" rel="stylesheet" type="text/css" />
<base target="_self" /> <base target="_self" />
</head> </head>
<body onresize="resizeInputs();" style="display:none; overflow:hidden;"> <body onresize="resizeInputs();" style="display:none; overflow:hidden;">

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

@ -4,14 +4,14 @@
<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>
<script type="text/javascript" src="js/editimage.js?ver=3091"></script> <script type="text/javascript" src="js/editimage.js?ver=3101"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=3091"></script> <script type="text/javascript" src="../../utils/form_utils.js?ver=3101"></script>
<link rel="stylesheet" href="css/editimage.css?ver=3091" type="text/css" media="all" /> <link rel="stylesheet" href="css/editimage.css?ver=3101" type="text/css" media="all" />
<link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=2.6-bleeding2" type="text/css" media="all" /> <link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=2.6-bleeding2" type="text/css" media="all" />
<script type="text/javascript"> <script type="text/javascript">
if ( 'rtl' == tinyMCEPopup.editor.getParam('directionality','') ) if ( 'rtl' == tinyMCEPopup.editor.getParam('directionality','') )
document.write('<link rel="stylesheet" href="css/editimage-rtl.css?ver=3091" type="text/css" media="all" />'); document.write('<link rel="stylesheet" href="css/editimage-rtl.css?ver=3101" type="text/css" media="all" />');
</script> </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=3091"></script> <script type="text/javascript" src="../../tiny_mce_popup.js?ver=3101"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=3091"></script> <script type="text/javascript" src="../../utils/mctabs.js?ver=3101"></script>
<script type="text/javascript" src="js/about.js?ver=3091"></script> <script type="text/javascript" src="js/about.js?ver=3101"></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=3091"></script> <script type="text/javascript" src="../../tiny_mce_popup.js?ver=3101"></script>
<script type="text/javascript" src="js/anchor.js?ver=3091"></script> <script type="text/javascript" src="js/anchor.js?ver=3101"></script>
<base target="_self" /> <base target="_self" />
</head> </head>
<body style="display: none"> <body style="display: none">

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

@ -3,8 +3,8 @@
<head> <head>
<title>{#advanced_dlg.charmap_title}</title> <title>{#advanced_dlg.charmap_title}</title>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=3091"></script> <script type="text/javascript" src="../../tiny_mce_popup.js?ver=3101"></script>
<script type="text/javascript" src="js/charmap.js?ver=3091"></script> <script type="text/javascript" src="js/charmap.js?ver=3101"></script>
<base target="_self" /> <base target="_self" />
</head> </head>
<body id="charmap" style="display:none"> <body id="charmap" style="display:none">

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=3091"></script> <script type="text/javascript" src="../../tiny_mce_popup.js?ver=3101"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=3091"></script> <script type="text/javascript" src="../../utils/mctabs.js?ver=3101"></script>
<script type="text/javascript" src="js/color_picker.js?ver=3091"></script> <script type="text/javascript" src="js/color_picker.js?ver=3101"></script>
<base target="_self" /> <base target="_self" />
</head> </head>
<body id="colorpicker" style="display: none"> <body id="colorpicker" style="display: none">

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=3091"></script> <script type="text/javascript" src="../../tiny_mce_popup.js?ver=3101"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=3091"></script> <script type="text/javascript" src="../../utils/mctabs.js?ver=3101"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=3091"></script> <script type="text/javascript" src="../../utils/form_utils.js?ver=3101"></script>
<script type="text/javascript" src="js/image.js?ver=3091"></script> <script type="text/javascript" src="js/image.js?ver=3101"></script>
<base target="_self" /> <base target="_self" />
</head> </head>
<body id="image" style="display: none"> <body id="image" style="display: none">

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=3091"></script> <script type="text/javascript" src="../../tiny_mce_popup.js?ver=3101"></script>
<script type="text/javascript" src="../../utils/mctabs.js?ver=3091"></script> <script type="text/javascript" src="../../utils/mctabs.js?ver=3101"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=3091"></script> <script type="text/javascript" src="../../utils/form_utils.js?ver=3101"></script>
<script type="text/javascript" src="../../utils/validate.js?ver=3091"></script> <script type="text/javascript" src="../../utils/validate.js?ver=3101"></script>
<script type="text/javascript" src="js/link.js?ver=3091"></script> <script type="text/javascript" src="js/link.js?ver=3101"></script>
<base target="_self" /> <base target="_self" />
</head> </head>
<body id="link" style="display: none"> <body id="link" style="display: none">

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

@ -2,8 +2,8 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>{#advanced_dlg.code_title}</title> <title>{#advanced_dlg.code_title}</title>
<script type="text/javascript" src="../../tiny_mce_popup.js?ver=3091"></script> <script type="text/javascript" src="../../tiny_mce_popup.js?ver=3101"></script>
<script type="text/javascript" src="js/source_editor.js?ver=3091"></script> <script type="text/javascript" src="js/source_editor.js?ver=3101"></script>
<base target="_self" /> <base target="_self" />
</head> </head>
<body onresize="resizeInputs();" style="display:none; overflow:hidden;"> <body onresize="resizeInputs();" style="display:none; overflow:hidden;">

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

File diff suppressed because one or more lines are too long

4
wp-includes/js/tinymce/tiny_mce_config.php
View File

@ -226,7 +226,7 @@ if ( $compress && isset($_SERVER['HTTP_ACCEPT_ENCODING']) ) {
// Setup cache info // Setup cache info
if ( $disk_cache ) { if ( $disk_cache ) {
$cacheKey = apply_filters('tiny_mce_version', '20080613'); $cacheKey = apply_filters('tiny_mce_version', '20080618');
foreach ( $initArray as $v ) foreach ( $initArray as $v )
$cacheKey .= $v; $cacheKey .= $v;
@ -273,7 +273,7 @@ if ( $mce_deprecated ) $mce_options .= $mce_deprecated;
$mce_options = rtrim( trim($mce_options), '\n\r,' ); $mce_options = rtrim( trim($mce_options), '\n\r,' );
$content = 'var tinyMCEPreInit = { settings : { themes : "' . $theme . '", plugins : "' . $initArray['plugins'] . '", languages : "' . $language . '", debug : false }, base : "' . $baseurl . '", suffix : "", query : "ver=3091" };'; $content = 'var tinyMCEPreInit = { settings : { themes : "' . $theme . '", plugins : "' . $initArray['plugins'] . '", languages : "' . $language . '", debug : false }, base : "' . $baseurl . '", suffix : "", query : "ver=3101" };';
// Load patch // Load patch
$content .= getFileContents( 'tiny_mce_ext.js' ); $content .= getFileContents( 'tiny_mce_ext.js' );

10
wp-includes/js/tinymce/utils/editable_selects.js
View File

@ -1,5 +1,5 @@
/** /**
* $Id: editable_selects.js 520 2008-01-07 16:30:32Z spocke $ * $Id: editable_selects.js 867 2008-06-09 20:33:40Z spocke $
* *
* Makes select boxes editable. * Makes select boxes editable.
* *
@ -39,6 +39,7 @@ var TinyMCE_EditableSelects = {
se.style.display = 'none'; se.style.display = 'none';
ne.focus(); ne.focus();
ne.onblur = TinyMCE_EditableSelects.onBlurEditableSelectInput; ne.onblur = TinyMCE_EditableSelects.onBlurEditableSelectInput;
ne.onkeydown = TinyMCE_EditableSelects.onKeyDown;
TinyMCE_EditableSelects.editSelectElm = se; TinyMCE_EditableSelects.editSelectElm = se;
} }
}, },
@ -57,5 +58,12 @@ var TinyMCE_EditableSelects = {
se.parentNode.removeChild(se.previousSibling); se.parentNode.removeChild(se.previousSibling);
TinyMCE_EditableSelects.editSelectElm = null; TinyMCE_EditableSelects.editSelectElm = null;
} }
},
onKeyDown : function(e) {
e = e || window.event;
if (e.keyCode == 13)
TinyMCE_EditableSelects.onBlurEditableSelectInput();
} }
}; };

2
wp-includes/js/tinymce/wp-mce-help.php
View File

@ -6,7 +6,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=3091"></script> <script type="text/javascript" src="tiny_mce_popup.js?ver=3101"></script>
<?php <?php
wp_admin_css( 'global', true ); wp_admin_css( 'global', true );
wp_admin_css( 'wp-admin', true ); wp_admin_css( 'wp-admin', true );

2
wp-includes/script-loader.php
View File

@ -35,7 +35,7 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'editor_functions', '/wp-admin/js/editor.js', false, '20080325' ); $scripts->add( 'editor_functions', '/wp-admin/js/editor.js', false, '20080325' );
// Modify this version when tinyMCE plugins are changed. // Modify this version when tinyMCE plugins are changed.
$mce_version = apply_filters('tiny_mce_version', '20080613'); $mce_version = apply_filters('tiny_mce_version', '20080618');
$scripts->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('editor_functions'), $mce_version ); $scripts->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('editor_functions'), $mce_version );
$scripts->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.6'); $scripts->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.6');