WordPress.org

Make WordPress Core

Changeset 27979


Ignore:
Timestamp:
04/07/2014 06:12:06 AM (4 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:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/js/media-audiovideo.js

    r27788 r27979  
    205205            autoplay : false,
    206206            preload : 'none',
    207             caption : '',
    208207            width : 400
    209208        },
     
    260259            preload : 'metadata',
    261260            content : '',
    262             caption : '',
    263261            width : 640,
    264262            height : 360
  • trunk/src/wp-includes/js/media-editor.js

    r27785 r27979  
    203203            }
    204204
    205             if ( ! _.isEmpty( attachment.caption ) ) {
    206                 shortcode.caption = attachment.caption;
    207             } else if ( attachment.meta && attachment.meta.title ) {
    208                 shortcode.caption = '“' + attachment.meta.title + '”';
    209                 if ( attachment.meta.album ) {
    210                     shortcode.caption += ' from ' + attachment.meta.album;
    211                 }
    212 
    213                 if ( attachment.meta.artist ) {
    214                     shortcode.caption += ' by ' + attachment.meta.artist;
    215                 }
    216             } else if ( ! _.isEmpty( attachment.description ) ) {
    217                 shortcode.caption = attachment.description;
    218             } else {
    219                 shortcode.caption = attachment.title;
    220             }
    221 
    222205            extension = attachment.filename.split('.').pop();
    223206
  • trunk/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css

    r27949 r27979  
    298298}
    299299
    300 .wpview-type-video .track-details,
    301 .wpview-type-audio .track-details {
    302     position: absolute;
    303     top: 0;
    304     left: 5px;
    305     width: 85%;
    306     overflow: hidden;
    307     white-space: nowrap;
    308     text-overflow: ellipsis;
    309 }
    310 
    311300.wpview-type-gallery:after {
    312301    content: '';
  • trunk/src/wp-includes/media-template.php

    r27946 r27979  
    852852                    <input type="checkbox" data-setting="loop" />
    853853                </label>
    854 
    855                 <label class="setting">
    856                     <span><?php _e( 'Caption' ); ?></span>
    857                     <input type="text" data-setting="caption" value="{{ data.model.caption }}" />
    858                 </label>
    859 
    860854                <div class="clear"></div>
    861855            </div>
     
    968962                    <# } #>
    969963                    <textarea class="hidden content-setting">{{ content }}</textarea>
    970                 </label>
    971 
    972                 <label class="setting">
    973                     <span><?php _e( 'Caption' ); ?></span>
    974                     <input type="text" data-setting="caption" value="{{ data.model.caption }}" />
    975964                </label>
    976965            </div>
     
    1010999            <div class="dashicons dashicons-no-alt remove"></div>
    10111000        </div>
    1012         <# if ( ! _.isEmpty( data.model.caption ) ) { #>
    1013         <div class="track-details">{{ data.model.caption }}</div>
    1014         <# } #>
    10151001        <?php wp_underscore_audio_template() ?>
    10161002        <div class="wpview-overlay"></div>
     
    10221008            <div class="dashicons dashicons-no-alt remove"></div>
    10231009        </div>
    1024         <# if ( ! _.isEmpty( data.model.caption ) ) { #>
    1025         <div class="track-details">{{ data.model.caption }}</div>
    1026         <# } #>
    10271010        <?php wp_underscore_video_template() ?>
    10281011        <div class="wpview-overlay"></div>
  • trunk/src/wp-includes/media.php

    r27974 r27979  
    13931393    $default_types = wp_get_audio_extensions();
    13941394    $defaults_atts = array(
    1395         'caption'  => '',
    13961395        'src'      => '',
    13971396        'loop'     => '',
     
    15531552    $default_types = wp_get_video_extensions();
    15541553    $defaults_atts = array(
    1555         'caption'  => '',
    15561554        'src'      => '',
    15571555        'poster'   => '',
Note: See TracChangeset for help on using the changeset viewer.