<!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>[27420] trunk/src/wp-includes: Add a timestamp to the urls passed to `<audio>` and `<video>` in the modal to ensure that cached view instances aren't referenced by MEjs.</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/27420">27420</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-03-05 21:36:32 +0000 (Wed, 05 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a timestamp to the urls passed to `<audio>` and `<video>` in the modal to ensure that cached view instances aren't referenced by MEjs. Pause the player when closing the controller's modal.
See <a href="http://core.trac.wordpress.org/ticket/27016">#27016</a>, <a href="http://core.trac.wordpress.org/ticket/26779">#26779</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 (27419 => 27420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-03-05 20:40:36 UTC (rev 27419)
+++ trunk/src/wp-includes/js/media-views.js 2014-03-05 21:36:32 UTC (rev 27420)
</span><span class="lines">@@ -6239,7 +6239,7 @@
</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>- new MediaElementPlayer( this.$('audio').get(0), settings );
</del><ins>+ new MediaElementPlayer( this.$('.wp-audio-shortcode').get(0), settings );
</ins><span class="cx">
</span><span class="cx"> return this;
</span><span class="cx"> },
</span><span class="lines">@@ -6264,13 +6264,10 @@
</span><span class="cx"> template: media.template('video-details'),
</span><span class="cx">
</span><span class="cx"> initialize: function() {
</span><del>- _.bindAll(this, 'player', 'played');
</del><ins>+ _.bindAll(this, 'player');
</ins><span class="cx">
</span><del>- this.removable = false;
</del><span class="cx"> this.listenTo( this.controller, 'close', this.close );
</span><span class="cx">
</span><del>- // used in AttachmentDisplay.prototype.updateLinkTo
- this.options.attachment = this.model.attachment;
</del><span class="cx"> media.view.Settings.AttachmentDisplay.prototype.initialize.apply( this, arguments );
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -6287,20 +6284,12 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> close : function() {
</span><del>- if ( this.removable ) {
- this.mejs.pause();
- }
</del><ins>+ this.mejs.pause();
</ins><span class="cx"> this.remove();
</span><del>- this.mejs = this.mejsInstance = null;
</del><span class="cx"> },
</span><span class="cx">
</span><del>- played : function () {
- this.removable = true;
- },
-
</del><span class="cx"> player : function (mejs) {
</span><span class="cx"> this.mejs = mejs;
</span><del>- this.mejs.addEventListener( 'play', this.played );
</del><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> render: function() {
</span><span class="lines">@@ -6315,10 +6304,7 @@
</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>- if ( ! this.mejsInstance ) {
- this.mejsInstance = new MediaElementPlayer( this.$('video').get(0), settings );
- }
-
</del><ins>+ new MediaElementPlayer( this.$('.wp-video-shortcode').get(0), settings );
</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 (27419 => 27420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media-template.php 2014-03-05 20:40:36 UTC (rev 27419)
+++ trunk/src/wp-includes/media-template.php 2014-03-05 21:36:32 UTC (rev 27420)
</span><span class="lines">@@ -654,11 +654,23 @@
</span><span class="cx"> <# var rendered = false; #>
</span><span class="cx"> <div class="media-embed">
</span><span class="cx"> <div class="embed-media-settings embed-audio-settings">
</span><del>- <# if ( data.model.src ) { #>
- <audio class="wp-audio-shortcode" src="{{{ data.model.src }}}"
</del><ins>+ <#
+ var src,
+ t = (new Date()).getTime();
+
+ if ( data.model.src ) {
+ src = data.model.src + (data.model.src.indexOf('?') > -1 ? '&' : '?' ) + t;
+ #>
+ <audio controls class="wp-audio-shortcode" src="{{{ src }}}"
</ins><span class="cx"> preload="{{{ _.isUndefined( data.model.preload ) ? 'none' : data.model.preload }}}"
</span><del>- <# if ( ! _.isUndefined( data.model.autoplay ) && data.model.autoplay ) { #>autoplay<# } #>
- <# if ( ! _.isUndefined( data.model.loop ) && data.model.loop ) { #>loop<# } #>
</del><ins>+ <#
+ if ( ! _.isUndefined( data.model.autoplay ) && data.model.autoplay ) {
+ #>autoplay<#
+ }
+
+ if ( ! _.isUndefined( data.model.loop ) && data.model.loop ) {
+ #>loop<#
+ } #>
</ins><span class="cx"> />
</span><span class="cx"> <# rendered = true; #>
</span><span class="cx"> <label class="setting">
</span><span class="lines">@@ -671,11 +683,18 @@
</span><span class="cx">
</span><span class="cx"> foreach ( $default_types as $type ): ?>
</span><span class="cx"> <# if ( data.model.<?php echo $type ?> ) { #>
</span><del>- <# if ( ! rendered ) { #>
- <audio class="wp-audio-shortcode" src="{{{ data.model.<?php echo $type ?> }}}"
</del><ins>+ <# if ( ! rendered ) {
+ src = data.model.<?php echo $type ?> + (data.model.<?php echo $type ?>.indexOf('?') > -1 ? '&' : '?' ) + t;
+ #>
+ <audio controls class="wp-audio-shortcode" src="{{{ src }}}"
</ins><span class="cx"> preload="{{{ _.isUndefined( data.model.preload ) ? 'none' : data.model.preload }}}"
</span><del>- <# if ( ! _.isUndefined( data.model.autoplay ) && data.model.autoplay ) { #>autoplay<# } #>
- <# if ( ! _.isUndefined( data.model.loop ) && data.model.loop ) { #>loop<# } #>
</del><ins>+ <#
+ if ( ! _.isUndefined( data.model.autoplay ) && data.model.autoplay ) {
+ #>autoplay<#
+ }
+ if ( ! _.isUndefined( data.model.loop ) && data.model.loop ) {
+ #>loop<#
+ } #>
</ins><span class="cx"> />
</span><span class="cx"> <#
</span><span class="cx"> rendered = true;
</span><span class="lines">@@ -723,22 +742,35 @@
</span><span class="cx"> <div class="embed-media-settings embed-video-settings">
</span><span class="cx"> <div class="wp-video-holder">
</span><span class="cx"> <#
</span><del>- var w = ! data.model.width || data.model.width > 640 ? 640 : data.model.width,
- h = ! data.model.height ? 320 : data.model.height;
</del><ins>+ var src,
+ t = (new Date()).getTime(),
+ w = ! data.model.width || data.model.width > 640 ? 640 : data.model.width,
+ h = ! data.model.height ? 360 : data.model.height;
</ins><span class="cx">
</span><span class="cx"> if ( w !== data.model.width ) {
</span><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 ) { #>
- <video class="wp-video-shortcode"
</del><ins>+ if ( data.model.src ) {
+ src = data.model.src + (data.model.src.indexOf('?') > -1 ? '&' : '?' ) + t;
+ #>
+ <video controls class="wp-video-shortcode"
</ins><span class="cx"> width="{{{ w }}}"
</span><span class="cx"> height="{{{ h }}}"
</span><del>- src="{{{ data.model.src }}}"
- <# if ( ! _.isUndefined( data.model.poster ) ) { #>poster="{{{ data.model.poster }}}"<# } #>
</del><ins>+ src="{{{ src }}}"
+ <#
+ if ( ! _.isUndefined( data.model.poster ) ) {
+ #>poster="{{{ data.model.poster }}}"<#
+ } #>
</ins><span class="cx"> preload="{{{ _.isUndefined( data.model.preload ) ? 'metadata' : data.model.preload }}}"
</span><del>- <# if ( ! _.isUndefined( data.model.autoplay ) && data.model.autoplay ) { #>autoplay<# } #>
- <# if ( ! _.isUndefined( data.model.loop ) && data.model.loop ) { #>loop<# } #>
</del><ins>+ <#
+ if ( ! _.isUndefined( data.model.autoplay ) && data.model.autoplay ) {
+ #>autoplay<#
+ }
+
+ if ( ! _.isUndefined( data.model.loop ) && data.model.loop ) {
+ #>loop<#
+ } #>
</ins><span class="cx"> />
</span><span class="cx"> <# rendered = true; #>
</span><span class="cx"> <label class="setting">
</span><span class="lines">@@ -751,15 +783,26 @@
</span><span class="cx">
</span><span class="cx"> foreach ( $default_types as $type ): ?>
</span><span class="cx"> <# if ( data.model.<?php echo $type ?> ) { #>
</span><del>- <# if ( ! rendered ) { #>
- <video class="wp-video-shortcode"
</del><ins>+ <# if ( ! rendered ) {
+ src = data.model.<?php echo $type ?> + (data.model.<?php echo $type ?>.indexOf('?') > -1 ? '&' : '?' ) + t;
+ #>
+ <video controls class="wp-video-shortcode"
</ins><span class="cx"> width="{{{ w }}}"
</span><span class="cx"> height="{{{ h }}}"
</span><del>- src="{{{ data.model.<?php echo $type ?> }}}"
- <# if ( ! _.isUndefined( data.model.poster ) ) { #>poster="{{{ data.model.poster }}}"<# } #>
</del><ins>+ src="{{{ src }}}"
+ <#
+ if ( ! _.isUndefined( data.model.poster ) ) {
+ #>poster="{{{ data.model.poster }}}"<#
+ } #>
</ins><span class="cx"> preload="{{{ _.isUndefined( data.model.preload ) ? 'metadata' : data.model.preload }}}"
</span><del>- <# if ( ! _.isUndefined( data.model.autoplay ) && data.model.autoplay ) { #>autoplay<# } #>
- <# if ( ! _.isUndefined( data.model.loop ) && data.model.loop ) { #>loop<# } #>
</del><ins>+ <#
+ if ( ! _.isUndefined( data.model.autoplay ) && data.model.autoplay ) {
+ #>autoplay<#
+ }
+
+ if ( ! _.isUndefined( data.model.loop ) && data.model.loop ) {
+ #>loop<#
+ } #>
</ins><span class="cx"> />
</span><span class="cx"> <#
</span><span class="cx"> rendered = true;
</span></span></pre>
</div>
</div>
</body>
</html>