Ticket #43640: 43640.2.patch
File 43640.2.patch, 4.4 KB (added by , 5 months ago) |
---|
-
src/js/media/views/attachment/details-two-column.js
diff --git a/src/js/media/views/attachment/details-two-column.js b/src/js/media/views/attachment/details-two-column.js index 7d0b441040..642c874302 100644
a b TwoColumn = Details.extend(/** @lends wp.media.view.Attachment.Details.TowColumn 37 37 */ 38 38 toggleSelectionHandler: function() {}, 39 39 40 render: function() {41 Details.prototype.render.apply( this, arguments );42 43 wp.media.mixin.removeAllPlayers();44 this.$( 'audio, video' ).each( function (i, elem) {45 var el = wp.media.view.MediaDetails.prepareSrc( elem );46 new window.MediaElementPlayer( el, wp.media.mixin.mejsSettings );47 } );48 }49 40 }); 50 41 51 42 module.exports = TwoColumn; -
src/js/media/views/attachment/details.js
diff --git a/src/js/media/views/attachment/details.js b/src/js/media/views/attachment/details.js index 877eac6371..5891fdf049 100644
a b Details = Attachment.extend(/** @lends wp.media.view.Attachment.Details.prototyp 198 198 this.moveFocus(); 199 199 } 200 200 }, 201 201 202 /** 202 203 * Untrashes an attachment. 203 204 * … … Details = Attachment.extend(/** @lends wp.media.view.Attachment.Details.prototyp 257 258 this.controller.trigger( 'attachment:details:shift-tab', event ); 258 259 return false; 259 260 } 261 }, 262 263 render: function() { 264 Attachment.prototype.render.apply( this, arguments ); 265 266 wp.media.mixin.removeAllPlayers(); 267 this.$( 'audio, video' ).each( function (i, elem) { 268 var el = wp.media.view.MediaDetails.prepareSrc( elem ); 269 new window.MediaElementPlayer( el, wp.media.mixin.mejsSettings ); 270 } ); 260 271 } 261 272 }); 262 273 -
src/wp-includes/css/media-views.css
diff --git a/src/wp-includes/css/media-views.css b/src/wp-includes/css/media-views.css index 40ab95a7bb..198bb448d0 100644
a b 1763 1763 padding-bottom: 11px; 1764 1764 } 1765 1765 1766 .attachment-info .wp-media-wrapper { 1767 margin-bottom: 8px; 1768 } 1769 1766 1770 .attachment-info .filename { 1767 1771 font-weight: 600; 1768 1772 color: #444; -
src/wp-includes/media-template.php
diff --git a/src/wp-includes/media-template.php b/src/wp-includes/media-template.php index 1f69382f12..7cfa0c316c 100644
a b function wp_print_media_templates() { 595 595 </span> 596 596 </h2> 597 597 <div class="attachment-info"> 598 <div class="thumbnail thumbnail-{{ data.type }}"> 599 <# if ( data.uploading ) { #> 600 <div class="media-progress-bar"><div></div></div> 601 <# } else if ( 'image' === data.type && data.size && data.size.url ) { #> 602 <img src="{{ data.size.url }}" draggable="false" alt="" /> 603 <# } else { #> 604 <img src="{{ data.icon }}" class="icon" draggable="false" alt="" /> 605 <# } #> 606 </div> 598 599 <# if ( 'audio' === data.type ) { #> 600 <div class="wp-media-wrapper"> 601 <audio style="visibility: hidden" controls class="wp-audio-shortcode" width="100%" preload="none"> 602 <source type="{{ data.mime }}" src="{{ data.url }}"/> 603 </audio> 604 </div> 605 <# } else if ( 'video' === data.type ) { 606 var w_rule = ''; 607 if ( data.width ) { 608 w_rule = 'width: ' + data.width + 'px;'; 609 } else if ( wp.media.view.settings.contentWidth ) { 610 w_rule = 'width: ' + wp.media.view.settings.contentWidth + 'px;'; 611 } 612 #> 613 <div style="{{ w_rule }}" class="wp-media-wrapper wp-video"> 614 <video controls="controls" class="wp-video-shortcode" preload="metadata" 615 <# if ( data.width ) { #>width="{{ data.width }}"<# } #> 616 <# if ( data.height ) { #>height="{{ data.height }}"<# } #> 617 <# if ( data.image && data.image.src !== data.icon ) { #>poster="{{ data.image.src }}"<# } #>> 618 <source type="{{ data.mime }}" src="{{ data.url }}"/> 619 </video> 620 </div> 621 <# } #> 622 623 <# if ( 'video' !== data.type && 'audio' !== data.type ) { #> 624 <div class="thumbnail thumbnail-{{ data.type }}"> 625 <# if ( data.uploading ) { #> 626 <div class="media-progress-bar"><div></div></div> 627 <# } else if ( 'image' === data.type && data.size && data.size.url ) { #> 628 <img src="{{ data.size.url }}" draggable="false" alt="" /> 629 <# } else { #> 630 <img src="{{ data.icon }}" class="icon" draggable="false" alt="" /> 631 <# } #> 632 </div> 633 <# } #> 634 607 635 <div class="details"> 608 636 <div class="filename">{{ data.filename }}</div> 609 637 <div class="uploaded">{{ data.dateFormatted }}</div>