<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[29456] trunk/src/wp-includes: Video: </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/29456">29456</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-08-09 19:38:40 +0000 (Sat, 09 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Video:
* Don't set height on responsive `<div>` when generating markup
* Move some CSS rules from the style tag to `.wp-video`
* Use Video Details view event delegation instead of click events delegated from `<body>`
* Fix some CSS rule collision in the grid modal
See <a href="http://core.trac.wordpress.org/ticket/29110">#29110</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescssmediaviewscss">trunk/src/wp-includes/css/media-views.css</a></li>
<li><a href="#trunksrcwpincludesjsmediaaudiovideojs">trunk/src/wp-includes/js/media-audiovideo.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaelementwpmediaelementcss">trunk/src/wp-includes/js/mediaelement/wp-mediaelement.css</a></li>
<li><a href="#trunksrcwpincludesmediatemplatephp">trunk/src/wp-includes/media-template.php</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescssmediaviewscss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/css/media-views.css (29455 => 29456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/css/media-views.css 2014-08-09 19:31:35 UTC (rev 29455)
+++ trunk/src/wp-includes/css/media-views.css 2014-08-09 19:38:40 UTC (rev 29456)
</span><span class="lines">@@ -2681,7 +2681,7 @@
</span><span class="cx"> height: 100%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.edit-attachment-frame .attachment-media-view img {
</del><ins>+.edit-attachment-frame .attachment-media-view .details-image {
</ins><span class="cx"> display: block;
</span><span class="cx"> margin-bottom: 16px;
</span><span class="cx"> max-width: 100%;
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaaudiovideojs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-audiovideo.js (29455 => 29456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-audiovideo.js 2014-08-09 19:31:35 UTC (rev 29455)
+++ trunk/src/wp-includes/js/media-audiovideo.js 2014-08-09 19:38:40 UTC (rev 29456)
</span><span class="lines">@@ -636,7 +636,8 @@
</span><span class="cx"> this.events = _.extend( this.events, {
</span><span class="cx"> 'click .remove-setting' : 'removeSetting',
</span><span class="cx"> 'change .content-track' : 'setTracks',
</span><del>- 'click .remove-track' : 'setTracks'
</del><ins>+ 'click .remove-track' : 'setTracks',
+ 'click .add-media-source' : 'addSource'
</ins><span class="cx"> } );
</span><span class="cx">
</span><span class="cx"> media.view.Settings.AttachmentDisplay.prototype.initialize.apply( this, arguments );
</span><span class="lines">@@ -682,6 +683,11 @@
</span><span class="cx"> this.trigger( 'media:setting:remove', this );
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ addSource : function( e ) {
+ this.controller.lastMime = $( e.currentTarget ).data( 'mime' );
+ this.controller.setState( 'add-' + this.controller.defaults.id + '-source' );
+ },
+
</ins><span class="cx"> /**
</span><span class="cx"> * @global MediaElementPlayer
</span><span class="cx"> */
</span><span class="lines">@@ -822,17 +828,4 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><del>- /**
- * Event binding
- */
- function init() {
- $(document.body)
- .on( 'click', '.add-media-source', function( e ) {
- media.frame.lastMime = $( e.currentTarget ).data( 'mime' );
- media.frame.setState( 'add-' + media.frame.defaults.id + '-source' );
- } );
- }
-
- $( init );
-
</del><span class="cx"> }(jQuery, _, Backbone));
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaelementwpmediaelementcss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/mediaelement/wp-mediaelement.css (29455 => 29456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/mediaelement/wp-mediaelement.css 2014-08-09 19:31:35 UTC (rev 29455)
+++ trunk/src/wp-includes/js/mediaelement/wp-mediaelement.css 2014-08-09 19:38:40 UTC (rev 29456)
</span><span class="lines">@@ -92,6 +92,11 @@
</span><span class="cx"> margin: 0 0 10px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.wp-video {
+ max-width: 100%;
+ height: auto;
+}
+
</ins><span class="cx"> video.wp-video-shortcode,
</span><span class="cx"> .wp-video-shortcode video {
</span><span class="cx"> max-width: 100%;
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media-template.php (29455 => 29456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media-template.php 2014-08-09 19:31:35 UTC (rev 29455)
+++ trunk/src/wp-includes/media-template.php 2014-08-09 19:38:40 UTC (rev 29456)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> function wp_underscore_video_template() {
</span><span class="cx"> $video_types = wp_get_video_extensions();
</span><span class="cx"> ?>
</span><del>-<# var w_rule = '', h_rule = '',
</del><ins>+<# var w_rule = '',
</ins><span class="cx"> w, h, settings = wp.media.view.settings,
</span><span class="cx"> isYouTube = ! _.isEmpty( data.model.src ) && data.model.src.match(/youtube|youtu\.be/);
</span><span class="cx">
</span><span class="lines">@@ -69,12 +69,8 @@
</span><span class="cx"> if ( w ) {
</span><span class="cx"> w_rule = ' width: ' + w + 'px;';
</span><span class="cx"> }
</span><del>-
- if ( h ) {
- h_rule = ' height: auto';
- }
</del><span class="cx"> #>
</span><del>-<div style="max-width: 100%;{{ w_rule }}{{ h_rule }}">
</del><ins>+<div style="{{ w_rule }}" class="wp-video">
</ins><span class="cx"> <video controls
</span><span class="cx"> class="wp-video-shortcode{{ isYouTube ? ' youtube-video' : '' }}"
</span><span class="cx"> <# if ( w ) { #>width="{{ w }}"<# } #>
</span><span class="lines">@@ -278,9 +274,9 @@
</span><span class="cx"> <# if ( data.uploading ) { #>
</span><span class="cx"> <div class="media-progress-bar"><div></div></div>
</span><span class="cx"> <# } else if ( 'image' === data.type ) { #>
</span><del>- <img src="{{ data.sizes.full.url }}" draggable="false" />
</del><ins>+ <img class="details-image" src="{{ data.sizes.full.url }}" draggable="false" />
</ins><span class="cx"> <# } else if ( -1 === jQuery.inArray( data.type, [ 'audio', 'video' ] ) ) { #>
</span><del>- <img src="{{ data.icon }}" class="icon" draggable="false" />
</del><ins>+ <img class="details-image" src="{{ data.icon }}" class="icon" draggable="false" />
</ins><span class="cx"> <# } #>
</span><span class="cx">
</span><span class="cx"> <# if ( 'audio' === data.type ) { #>
</span><span class="lines">@@ -290,18 +286,15 @@
</span><span class="cx"> </audio>
</span><span class="cx"> </div>
</span><span class="cx"> <# } else if ( 'video' === data.type ) {
</span><del>- var w_rule = h_rule = '';
</del><ins>+ var w_rule = '';
</ins><span class="cx"> if ( data.width ) {
</span><del>- w_rule = ' width: ' + data.width + 'px;';
</del><ins>+ w_rule = 'width: ' + data.width + 'px;';
</ins><span class="cx"> } else if ( wp.media.view.settings.contentWidth ) {
</span><del>- w_rule = ' width: ' + wp.media.view.settings.contentWidth + 'px;';
</del><ins>+ w_rule = 'width: ' + wp.media.view.settings.contentWidth + 'px;';
</ins><span class="cx"> }
</span><del>- if ( data.height ) {
- h_rule = ' height: auto';
- }
</del><span class="cx"> #>
</span><del>- <div style="max-width: 100%; {{ w_rule }}{{ h_rule }}" class="wp-media-wrapper">
- <video controls class="wp-video-shortcode" preload="metadata"
</del><ins>+ <div style="{{ w_rule }}" class="wp-media-wrapper wp-video">
+ <video controls="controls" class="wp-video-shortcode" preload="metadata"
</ins><span class="cx"> <# if ( data.width ) { #>width="{{ data.width }}"<# } #>
</span><span class="cx"> <# if ( data.height ) { #>height="{{ data.height }}"<# } #>
</span><span class="cx"> <# if ( data.image && data.image.src !== data.icon ) { #>poster="{{ data.image.src }}"<# } #>>
</span></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media.php (29455 => 29456)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media.php 2014-08-09 19:31:35 UTC (rev 29455)
+++ trunk/src/wp-includes/media.php 2014-08-09 19:38:40 UTC (rev 29456)
</span><span class="lines">@@ -1874,16 +1874,11 @@
</span><span class="cx"> }
</span><span class="cx"> $html .= '</video>';
</span><span class="cx">
</span><del>- $width_rule = $height_rule = '';
</del><ins>+ $width_rule = '';
</ins><span class="cx"> if ( ! empty( $atts['width'] ) ) {
</span><span class="cx"> $width_rule = sprintf( ' width: %dpx;', $atts['width'] );
</span><span class="cx"> }
</span><del>- if ( ! empty( $atts['height'] ) ) {
- $height_rule = sprintf( ' height: %dpx;', $atts['height'] );
- } else {
- $height_rule = ' height: auto;';
- }
- $output = sprintf( '<div style="max-width: 100%%;%s%s" class="wp-video">%s</div>', $width_rule, $height_rule, $html );
</del><ins>+ $output = sprintf( '<div style="%s" class="wp-video">%s</div>', $width_rule, $html );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Filter the output of the video shortcode.
</span></span></pre>
</div>
</div>
</body>
</html>