Changeset 8517

Timestamp:

08/01/2008 05:10:27 AM (16 years ago)

Author:

azaozz

Message:

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

Location:

trunk

Files:

• wp-admin/gears-manifest.php (modified) (4 diffs)
• wp-includes/js/tinymce/plugins/wpeditimage/editimage.html (modified) (1 diff)
• wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js (modified) (1 diff)
• wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js (modified) (1 diff)
• wp-includes/js/tinymce/tiny_mce_config.php (modified) (1 diff)

trunk/wp-admin/gears-manifest.php

@@ -65 +65 @@
 {
 "betaManifestVersion" : 1,
-"version" : "<?php echo $man_version; ?>_20080730",
+"version" : "<?php echo $man_version; ?>_20080731",
 "entries" : [
 <?php echo $defaults; ?>
@@ -119 +119 @@
 { "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/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/themes/advanced/editor_template.js?ver=311b" },
@@ -136 +136 @@
 { "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/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" },
 
@@ -149 +149 @@
 { "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/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/wordpress.css?ver=311b" },

trunk/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html

@@ -5 +5 @@
 <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>
 
-<link rel="stylesheet" href="css/editimage.css?ver=311e" 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="css/editimage.css?ver=311f" 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">
 if ( 'rtl' == tinyMCEPopup.editor.getParam('directionality','') )

trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js

@@ -16 +16 @@
                     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' );
             });

trunk/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js

@@ -246 +246 @@
 
     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','');
 

trunk/wp-includes/js/tinymce/tiny_mce_config.php

@@ -216 +216 @@
 if ( $disk_cache ) {
 
-    $cacheKey = apply_filters('tiny_mce_version', '20080730');
+    $cacheKey = apply_filters('tiny_mce_version', '20080731');
 
     foreach ( $initArray as $v )