Changeset 27979

Timestamp:

04/07/2014 06:12:06 AM (10 years ago)

Author:

wonderboymusic

Message:

[27640] supported a caption for audio and video shortcodes as part of a UX iteration for the related MCE views. These captions have since be excluded, so the extra code should be removed (it was there for this sole reason).

See #27320.

Location:

trunk/src/wp-includes

Files:

• js/media-audiovideo.js (modified) (2 diffs)
• js/media-editor.js (modified) (1 diff)
• js/tinymce/skins/wordpress/wp-content.css (modified) (1 diff)
• media-template.php (modified) (4 diffs)
• media.php (modified) (2 diffs)

trunk/src/wp-includes/js/media-audiovideo.js

@@ -205 +205 @@
             autoplay : false,
             preload : 'none',
-            caption : '',
             width : 400
         },
@@ -260 +259 @@
             preload : 'metadata',
             content : '',
-            caption : '',
             width : 640,
             height : 360

trunk/src/wp-includes/js/media-editor.js

@@ -203 +203 @@
             }
 
-            if ( ! _.isEmpty( attachment.caption ) ) {
-                shortcode.caption = attachment.caption;
-            } else if ( attachment.meta && attachment.meta.title ) {
-                shortcode.caption = '“' + attachment.meta.title + '”';
-                if ( attachment.meta.album ) {
-                    shortcode.caption += ' from ' + attachment.meta.album;
-                }
-
-                if ( attachment.meta.artist ) {
-                    shortcode.caption += ' by ' + attachment.meta.artist;
-                }
-            } else if ( ! _.isEmpty( attachment.description ) ) {
-                shortcode.caption = attachment.description;
-            } else {
-                shortcode.caption = attachment.title;
-            }
-
             extension = attachment.filename.split('.').pop();
 

trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css

@@ -298 +298 @@
 }
 
-.wpview-type-video .track-details,
-.wpview-type-audio .track-details {
-    position: absolute;
-    top: 0;
-    left: 5px;
-    width: 85%;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-}
-
 .wpview-type-gallery:after {
     content: '';

trunk/src/wp-includes/media-template.php

@@ -852 +852 @@
                     <input type="checkbox" data-setting="loop" />
                 </label>
-
-                <label class="setting">
-                    <span><?php _e( 'Caption' ); ?></span>
-                    <input type="text" data-setting="caption" value="{{ data.model.caption }}" />
-                </label>
-
                 <div class="clear"></div>
             </div>
@@ -968 +962 @@
                     <# } #>
                     <textarea class="hidden content-setting">{{ content }}</textarea>
-                </label>
-
-                <label class="setting">
-                    <span><?php _e( 'Caption' ); ?></span>
-                    <input type="text" data-setting="caption" value="{{ data.model.caption }}" />
                 </label>
             </div>
@@ -1010 +999 @@
             <div class="dashicons dashicons-no-alt remove"></div>
         </div>
-        <# if ( ! _.isEmpty( data.model.caption ) ) { #>
-        <div class="track-details">{{ data.model.caption }}</div>
-        <# } #>
         <?php wp_underscore_audio_template() ?>
         <div class="wpview-overlay"></div>
@@ -1022 +1008 @@
             <div class="dashicons dashicons-no-alt remove"></div>
         </div>
-        <# if ( ! _.isEmpty( data.model.caption ) ) { #>
-        <div class="track-details">{{ data.model.caption }}</div>
-        <# } #>
         <?php wp_underscore_video_template() ?>
         <div class="wpview-overlay"></div>

trunk/src/wp-includes/media.php

@@ -1393 +1393 @@
     $default_types = wp_get_audio_extensions();
     $defaults_atts = array(
-        'caption'  => '',
         'src'      => '',
         'loop'     => '',
@@ -1553 +1552 @@
     $default_types = wp_get_video_extensions();
     $defaults_atts = array(
-        'caption'  => '',
         'src'      => '',
         'poster'   => '',