Changeset 8607

Timestamp:

08/10/2008 07:33:44 PM (17 years ago)

Author:

azaozz

Message:

Removes the disabling of captions, but leaves couple of hooks so a plugin can do it easily. For 2.6.1, see #6812

Location:

branches/2.6

Files:

• wp-admin/gears-manifest.php (modified) (4 diffs)
• wp-admin/includes/media.php (modified) (8 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) (3 diffs)
• wp-includes/media.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

branches/2.6/wp-admin/gears-manifest.php

@@ -65 +65 @@
 {
 "betaManifestVersion" : 1,
-"version" : "<?php echo $man_version; ?>_20080731",
+"version" : "<?php echo $man_version; ?>_20080810",
 "entries" : [
 <?php echo $defaults; ?>
@@ -132 +132 @@
 { "url" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js?ver=311" },
 { "url" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js?ver=311" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=311f" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=311g" },
 { "url" : "../wp-includes/js/tinymce/tiny_mce.js?ver=311" },
 { "url" : "../wp-includes/js/tinymce/themes/advanced/editor_template.js?ver=311" },
@@ -149 +149 @@
 { "url" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm?ver=311" },
 { "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=311" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311f" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311g" },
 { "url" : "../wp-includes/js/tinymce/wp-mce-help.php?ver=311" },
 
@@ -162 +162 @@
 { "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=311" },
 { "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=311" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=311f" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=311g" },
 { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css?ver=311" },
 { "url" : "../wp-includes/js/tinymce/wordpress.css?ver=311" },

branches/2.6/wp-admin/includes/media.php

@@ -68 +68 @@
 function image_add_caption( $html, $id, $alt, $title, $align, $url, $size ) {
 
-    // CAPTIONS_OFF is temporary. Do not use it.
-    if ( empty($alt) || ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF ) ) return $html;
+    if ( empty($alt) || apply_filters( 'disable_captions', '' ) ) return $html;
     $id = ( 0 < (int) $id ) ? 'attachment_' . $id : '';
 
@@ -511 +510 @@
         $form_fields['post_title']['required'] = true;
 
-        // CAPTIONS_OFF is temporary. Do not use it.
-        if ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF ) {
-            $form_fields['post_excerpt']['label'] = __('Alternate Text');
-            $form_fields['post_excerpt']['helps'][] = __('Alt text for the image, e.g. "The Mona Lisa"');
-        } else {
-            $form_fields['post_excerpt']['label'] = __('Caption');
-            $form_fields['post_excerpt']['helps'][] = __('Also used as alternate text for the image');
-        }
+        $form_fields['post_excerpt']['label'] = __('Caption');
+        $form_fields['post_excerpt']['helps'][] = __('Also used as alternate text for the image');
 
         $form_fields['post_content']['label'] = __('Description');
@@ -607 +600 @@
     $link = get_attachment_link($post->ID);
 
-    // CAPTIONS_OFF is temporary. Do not use it.
-    if ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF )
-        $alt = __('Alternate Text');
-    else
-        $alt = __('Caption');
-
     $form_fields = array(
         'post_title'   => array(
@@ -619 +606 @@
         ),
         'post_excerpt' => array(
-            'label'      => $alt,
+            'label'      => __('Caption'),
             'value'      => $edit_post->post_excerpt,
         ),
@@ -1020 +1007 @@
         if ( f.alt.value ) {
             alt = f.alt.value.replace(/['"<>]+/g, '');
-<?php if ( ! defined('CAPTIONS_OFF') || true != CAPTIONS_OFF ) { // CAPTIONS_OFF is temporary. Do not use it. ?>
+<?php if ( ! apply_filters( 'disable_captions', '' ) ) { ?>
             caption = f.alt.value.replace(/'/g, '&#39;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
 <?php } ?>
@@ -1278 +1265 @@
 
 function type_form_image() {
-    $form = '
+
+    if ( apply_filters( 'disable_captions', '' ) ) {
+        $alt = __('Alternate Text');
+        $alt_help = __('Alt text for the image, e.g. "The Mona Lisa"');
+    } else {
+        $alt = __('Image Caption');
+        $alt_help = __('Also used as alternate text for the image');
+    }
+
+    return '
     <table class="describe"><tbody>
         <tr>
@@ -1295 +1291 @@
             <td class="field"><p><input id="title" name="title" value="" type="text" aria-required="true" /></p></td>
         </tr>
-';
-    // CAPTIONS_OFF is temporary. Do not use it.
-    if ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF ) {
-        $form .= '
+
         <tr>
             <th valign="top" scope="row" class="label">
-                <span class="alignleft"><label for="alt">' . __('Alternate Text') . '</label></span>
+                <span class="alignleft"><label for="alt">' . $alt . '</label></span>
             </th>
             <td class="field"><input id="alt" name="alt" value="" type="text" aria-required="true" />
-            <p class="help">' . __('Alt text for the image, e.g. "The Mona Lisa"') . '</p></td>
-        </tr>
-';
-
-    } else {
-        $form .= '
-        <tr>
-            <th valign="top" scope="row" class="label">
-                <span class="alignleft"><label for="alt">' . __('Image Caption') . '</label></span>
-            </th>
-            <td class="field"><input id="alt" name="alt" value="" type="text" aria-required="true" />
-            <p class="help">' . __('Also used as alternate text for the image') . '</p></td>
-        </tr>
-';
-    }
-        $form .= '
+            <p class="help">' . $alt_help . '</p></td>
+        </tr>
+
         <tr class="align">
             <th valign="top" scope="row" class="label"><p><label for="align">' . __('Alignment') . '</label></p></th>
@@ -1354 +1334 @@
 ';
 
-    return $form;
 }
 

branches/2.6/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html

@@ -5 +5 @@
 <title></title>
 
-<script type="text/javascript" src="js/editimage.js?ver=311f"></script>
+<script type="text/javascript" src="js/editimage.js?ver=311g"></script>
 <script type="text/javascript" src="../../utils/form_utils.js?ver=311"></script>
 
-<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="css/editimage.css?ver=311g" type="text/css" media="all" />
+<link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=2.6.1" type="text/css" media="all" />
 <script type="text/javascript">
 if ( 'rtl' == tinyMCEPopup.editor.getParam('directionality','') )

branches/2.6/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js

@@ -16 +16 @@
                     return;
 
-                tb_show('', url + '/editimage.html?ver=311f&TB_iframe=true');
+                tb_show('', url + '/editimage.html?ver=311g&TB_iframe=true');
                 tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
             });

branches/2.6/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js

@@ -249 +249 @@
         document.dir = tinyMCEPopup.editor.getParam('directionality','');
 
-        if ( ! tinyMCEPopup.editor.getParam('wpeditimage_do_captions', true) )
+        if ( tinyMCEPopup.editor.getParam('wpeditimage_disable_captions', false) )
             t.I('cap_field').style.display = 'none';
 

branches/2.6/wp-includes/js/tinymce/tiny_mce_config.php

@@ -131 +131 @@
 $mce_buttons_4 = implode($mce_buttons_4, ',');
 
-$do_captions = ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF ) ? false : true;
+$no_captions = ( apply_filters( 'disable_captions', '' ) ) ? true : false;
 
 // TinyMCE init settings
@@ -166 +166 @@
     'content_css' => "$mce_css",
     'save_callback' => 'switchEditors.saveCallback',
-    'wpeditimage_do_captions' => $do_captions,
+    'wpeditimage_disable_captions' => $no_captions,
     'plugins' => "$plugins",
     // pass-through the settings for compression and caching, so they can be changed with "tiny_mce_before_init"
@@ -226 +226 @@
 if ( $disk_cache ) {
 
-    $cacheKey = apply_filters('tiny_mce_version', '20080731');
+    $cacheKey = apply_filters('tiny_mce_version', '20080810');
 
     foreach ( $initArray as $v )

branches/2.6/wp-includes/media.php

@@ -355 +355 @@
 
 function img_caption_shortcode($attr, $content = null) {
-
-    if ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF )
-        return $content;
 
     // Allow plugins/themes to override the default caption template.

branches/2.6/wp-includes/script-loader.php

@@ -38 +38 @@
 
     // Modify this version when tinyMCE plugins are changed.
-    $mce_version = apply_filters('tiny_mce_version', '20080710');
+    $mce_version = apply_filters('tiny_mce_version', '20080810');
     $scripts->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('editor_functions'), $mce_version );