<!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>[27452] trunk/src/wp-includes: Videos in the media modal:</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/27452">27452</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-03-07 08:31:57 +0000 (Fri, 07 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Videos in the media modal:
* Support rendering of chromeless YouTube when a video shortcode's `src` is a YouTube URL.
* Don't instantiate an instance of `MediaElementPlayer` until after the view has been attached to the DOM and the view's `ready` event has fired.
* Don't set `poster` for videos when its value is empty. Much like `src` in the `img` tag - when empty, it will assume and load the current window's URL.
* When removing a player instance, don't call the `pause` method if the playback is not native.
See <a href="http://core.trac.wordpress.org/ticket/27016">#27016</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</a></li>
<li><a href="#trunksrcwpincludesmediatemplatephp">trunk/src/wp-includes/media-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (27451 => 27452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-03-07 06:33:06 UTC (rev 27451)
+++ trunk/src/wp-includes/js/media-views.js 2014-03-07 08:31:57 UTC (rev 27452)
</span><span class="lines">@@ -6384,6 +6384,7 @@
</span><span class="cx"> _.bindAll(this, 'success', 'close');
</span><span class="cx">
</span><span class="cx"> this.listenTo( this.controller, 'close', this.close );
</span><ins>+ this.on( 'ready', this.setPlayer );
</ins><span class="cx">
</span><span class="cx"> media.view.Settings.AttachmentDisplay.prototype.initialize.apply( this, arguments );
</span><span class="cx"> },
</span><span class="lines">@@ -6411,10 +6412,19 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> setPlayer : function () {
</span><del>- this.player = false;
</del><ins>+ if ( ! this.player ) {
+ this.player = new MediaElementPlayer( this.media, this.settings );
+ }
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * @abstract
+ */
+ setMedia : function () {
+ return this;
+ },
+
+ /**
</ins><span class="cx"> * Override the MediaElement method for removing a player.
</span><span class="cx"> * MediaElement tries to pull the audio/video tag out of
</span><span class="cx"> * its container and re-add it to the DOM.
</span><span class="lines">@@ -6449,8 +6459,11 @@
</span><span class="cx">
</span><span class="cx"> close : function() {
</span><span class="cx"> if ( this.player ) {
</span><del>- this.mejs.pause();
</del><ins>+ if ( _.isUndefined( this.mejs.pluginType ) ) {
+ this.mejs.pause();
+ }
</ins><span class="cx"> this.remove();
</span><ins>+ this.player = false;
</ins><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -6478,9 +6491,9 @@
</span><span class="cx"> media.view.Settings.AttachmentDisplay.prototype.render.apply( this, arguments );
</span><span class="cx"> setTimeout( function() { self.resetFocus(); }, 10 );
</span><span class="cx">
</span><del>- this.setPlayer( settings );
</del><ins>+ this.settings = settings;
</ins><span class="cx">
</span><del>- return this;
</del><ins>+ return this.setMedia();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> resetFocus: function() {
</span><span class="lines">@@ -6503,12 +6516,11 @@
</span><span class="cx"> className: 'audio-details',
</span><span class="cx"> template: media.template('audio-details'),
</span><span class="cx">
</span><del>- setPlayer: function( settings ) {
</del><ins>+ setMedia: function() {
</ins><span class="cx"> var audio = this.$('.wp-audio-shortcode').get(0);
</span><span class="cx">
</span><del>- audio = this.prepareSrc( audio );
</del><ins>+ this.media = this.prepareSrc( audio );
</ins><span class="cx">
</span><del>- this.player = new MediaElementPlayer( audio, settings );
</del><span class="cx"> return this;
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="lines">@@ -6528,12 +6540,17 @@
</span><span class="cx"> className: 'video-details',
</span><span class="cx"> template: media.template('video-details'),
</span><span class="cx">
</span><del>- setPlayer: function( settings ) {
- var video = this.$('.wp-video-shortcode').get(0);
</del><ins>+ setMedia: function() {
+ var video = this.$('.wp-video-shortcode');
</ins><span class="cx">
</span><del>- video = this.prepareSrc( video );
</del><ins>+ if ( ! video.hasClass('youtube-video') ) {
+ video = this.prepareSrc( video.get(0) );
+ } else {
+ video = video.get(0);
+ }
</ins><span class="cx">
</span><del>- this.player = new MediaElementPlayer( video, settings );
</del><ins>+ this.media = video;
+
</ins><span class="cx"> return this;
</span><span class="cx"> }
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media-template.php (27451 => 27452)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media-template.php 2014-03-07 06:33:06 UTC (rev 27451)
+++ trunk/src/wp-includes/media-template.php 2014-03-07 08:31:57 UTC (rev 27452)
</span><span class="lines">@@ -739,12 +739,42 @@
</span><span class="cx"> var w = ! data.model.width || data.model.width > 640 ? 640 : data.model.width,
</span><span class="cx"> h = ! data.model.height ? 360 : data.model.height;
</span><span class="cx">
</span><del>- if ( w !== data.model.width ) {
</del><ins>+ if ( data.model.width && w !== data.model.width ) {
</ins><span class="cx"> h = Math.ceil( ( h * w ) / data.model.width );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( data.model.src ) { #>
</del><ins>+ if ( data.model.src ) {
+ if ( data.model.src.match(/youtube|youtu\.be/) ) {
+ #>
</ins><span class="cx"> <video controls
</span><ins>+ class="wp-video-shortcode youtube-video"
+ width="{{{ w }}}"
+ height="{{{ h }}}"
+ <?php
+ $props = array( 'poster' => '', 'preload' => 'metadata' );
+ foreach ( $props as $key => $value ):
+ if ( empty( $value ) ) {
+ ?><#
+ if ( ! _.isUndefined( data.model.<?php echo $key ?> ) && data.model.<?php echo $key ?> ) {
+ #> <?php echo $key ?>="{{{ data.model.<?php echo $key ?> }}}"<#
+ } #>
+ <?php } else {
+ echo $key ?>="{{{ _.isUndefined( data.model.<?php echo $key ?> ) ? '<?php echo $value ?>' : data.model.<?php echo $key ?> }}}"<?php
+ }
+ endforeach;
+ ?><#
+ <?php foreach ( array( 'autoplay', 'loop' ) as $attr ):
+ ?> if ( ! _.isUndefined( data.model.<?php echo $attr ?> ) && data.model.<?php echo $attr ?> ) {
+ #> <?php echo $attr ?><#
+ }
+ <?php endforeach ?>#>
+ >
+ <source type="video/youtube" src="{{{ data.model.src }}}" />
+ </video>
+ <#
+ } else {
+ #>
+ <video controls
</ins><span class="cx"> class="wp-video-shortcode"
</span><span class="cx"> width="{{{ w }}}"
</span><span class="cx"> height="{{{ h }}}"
</span><span class="lines">@@ -752,8 +782,15 @@
</span><span class="cx"> <?php
</span><span class="cx"> $props = array( 'poster' => '', 'preload' => 'metadata' );
</span><span class="cx"> foreach ( $props as $key => $value ):
</span><del>- echo $key ?>="{{{ _.isUndefined( data.model.<?php echo $key ?> ) ? '<?php echo $value ?>' : data.model.<?php echo $key ?> }}}"
- <?php endforeach;
</del><ins>+ if ( empty( $value ) ) {
+ ?><#
+ if ( ! _.isUndefined( data.model.<?php echo $key ?> ) && data.model.<?php echo $key ?> ) {
+ #> <?php echo $key ?>="{{{ data.model.<?php echo $key ?> }}}"<#
+ } #>
+ <?php } else {
+ echo $key ?>="{{{ _.isUndefined( data.model.<?php echo $key ?> ) ? '<?php echo $value ?>' : data.model.<?php echo $key ?> }}}"<?php
+ }
+ endforeach;
</ins><span class="cx"> ?><#
</span><span class="cx"> <?php foreach ( array( 'autoplay', 'loop' ) as $attr ):
</span><span class="cx"> ?> if ( ! _.isUndefined( data.model.<?php echo $attr ?> ) && data.model.<?php echo $attr ?> ) {
</span><span class="lines">@@ -761,12 +798,13 @@
</span><span class="cx"> }
</span><span class="cx"> <?php endforeach ?>#>
</span><span class="cx"> />
</span><del>- <# rendered = true; #>
</del><span class="cx"> <label class="setting">
</span><span class="cx"> <span>SRC</span>
</span><span class="cx"> <input type="text" disabled="disabled" data-setting="src" value="{{{ data.model.src }}}" />
</span><span class="cx"> </label>
</span><del>- <# } #>
</del><ins>+ <# }
+ rendered = true;
+ } #>
</ins><span class="cx"> <?php
</span><span class="cx"> $default_types = wp_get_video_extensions();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>