Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-23 00:31:28 +01:00
Code Issues Projects Releases Wiki Activity

When not using image captions, IE may add caption null, for 2.7

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@8517 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2008-08-01 05:10:27 +00:00
parent 3c99cfc4f5
commit 0c4dbbadca
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' );
?> ?>
{ {
"betaManifestVersion" : 1, "betaManifestVersion" : 1,
"version" : "<?php echo $man_version; ?>_20080730", "version" : "<?php echo $man_version; ?>_20080731",
"entries" : [ "entries" : [
<?php echo $defaults; ?> <?php echo $defaults; ?>
@ -118,7 +118,7 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' );
{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/link.js?ver=311b" }, { "url" : "../wp-includes/js/tinymce/themes/advanced/js/link.js?ver=311b" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js?ver=311b" }, { "url" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js?ver=311b" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js?ver=311b" }, { "url" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js?ver=311b" },
{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=311e" }, { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=311f" },
{ "url" : "../wp-includes/js/tinymce/tiny_mce.js?ver=311b" }, { "url" : "../wp-includes/js/tinymce/tiny_mce.js?ver=311b" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/editor_template.js?ver=311b" }, { "url" : "../wp-includes/js/tinymce/themes/advanced/editor_template.js?ver=311b" },
{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js?ver=311b" }, { "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js?ver=311b" },
@ -135,7 +135,7 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' );
{ "url" : "../wp-includes/js/tinymce/plugins/paste/pastetext.htm?ver=311b" }, { "url" : "../wp-includes/js/tinymce/plugins/paste/pastetext.htm?ver=311b" },
{ "url" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm?ver=311b" }, { "url" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm?ver=311b" },
{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=311b" }, { "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=311b" },
{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311e" }, { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311f" },
{ "url" : "../wp-includes/js/tinymce/wp-mce-help.php?ver=311b" }, { "url" : "../wp-includes/js/tinymce/wp-mce-help.php?ver=311b" },
{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css?ver=311b" }, { "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css?ver=311b" },
@ -148,7 +148,7 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' );
{ "url" : "../wp-includes/js/tinymce/plugins/media/css/media.css?ver=311b" }, { "url" : "../wp-includes/js/tinymce/plugins/media/css/media.css?ver=311b" },
{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=311b" }, { "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=311b" },
{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=311b" }, { "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=311b" },
{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=311e" }, { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=311f" },
{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css?ver=311b" }, { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css?ver=311b" },
{ "url" : "../wp-includes/js/tinymce/wordpress.css?ver=311b" }, { "url" : "../wp-includes/js/tinymce/wordpress.css?ver=311b" },

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

@ -4,11 +4,11 @@
<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=311e"></script> <script type="text/javascript" src="js/editimage.js?ver=311f"></script>
<script type="text/javascript" src="../../utils/form_utils.js?ver=311b"></script> <script type="text/javascript" src="../../utils/form_utils.js?ver=311b"></script>
<link rel="stylesheet" href="css/editimage.css?ver=311e" type="text/css" media="all" /> <link rel="stylesheet" href="css/editimage.css?ver=311f" type="text/css" media="all" />
<link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=2.6" type="text/css" media="all" /> <link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=20080709" 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=311b" type="text/css" media="all" />'); document.write('<link rel="stylesheet" href="css/editimage-rtl.css?ver=311b" type="text/css" media="all" />');

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

@ -15,7 +15,7 @@
if ( ed.dom.getAttrib(el, 'class').indexOf('mceItem') != -1 || el.nodeName != 'IMG' ) if ( ed.dom.getAttrib(el, 'class').indexOf('mceItem') != -1 || el.nodeName != 'IMG' )
return; return;
tb_show('', url + '/editimage.html?ver=311e&TB_iframe=true'); tb_show('', url + '/editimage.html?ver=311f&TB_iframe=true');
tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' ); tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
}); });

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

@ -245,7 +245,7 @@ var wpImage = {
}, },
setup : function() { setup : function() {
var t = this, h, c, el, id, link, fname, f = document.forms[0], ed = tinyMCEPopup.editor, d = t.I('img_demo'), dom = tinyMCEPopup.dom, DL, caption = null; var t = this, h, c, el, id, link, fname, f = document.forms[0], ed = tinyMCEPopup.editor, d = t.I('img_demo'), dom = tinyMCEPopup.dom, DL, caption = '';
document.dir = tinyMCEPopup.editor.getParam('directionality',''); document.dir = tinyMCEPopup.editor.getParam('directionality','');
if ( tinyMCEPopup.editor.getParam('wpeditimage_disable_captions', false) ) if ( tinyMCEPopup.editor.getParam('wpeditimage_disable_captions', false) )

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

@ -215,7 +215,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', '20080730'); $cacheKey = apply_filters('tiny_mce_version', '20080731');
foreach ( $initArray as $v ) foreach ( $initArray as $v )
$cacheKey .= $v; $cacheKey .= $v;