<!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>[27871] trunk/src/wp-includes: Re-instantiate the `MediaElementPlayer` instance when switching mime types in playlists.</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/27871">27871</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-03-31 15:34:23 +0000 (Mon, 31 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Re-instantiate the `MediaElementPlayer` instance when switching mime types in playlists.
Fixes <a href="http://core.trac.wordpress.org/ticket/27608">#27608</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmediaelementwpplaylistjs">trunk/src/wp-includes/js/mediaelement/wp-playlist.js</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjsmediaelementwpplaylistjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/mediaelement/wp-playlist.js (27870 => 27871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/mediaelement/wp-playlist.js 2014-03-31 07:29:29 UTC (rev 27870)
+++ trunk/src/wp-includes/js/mediaelement/wp-playlist.js 2014-03-31 15:34:23 UTC (rev 27871)
</span><span class="lines">@@ -4,13 +4,9 @@
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><span class="cx"> var WPPlaylistView = Backbone.View.extend({
</span><del>- index : 0,
-
- itemTemplate : wp.template('wp-playlist-item'),
-
</del><span class="cx"> initialize : function (options) {
</span><del>- var settings = {};
-
</del><ins>+ this.index = 0;
+ this.settings = {};
</ins><span class="cx"> this.data = options.metadata || $.parseJSON( this.$('script').html() );
</span><span class="cx"> this.playerNode = this.$( this.data.type );
</span><span class="cx">
</span><span class="lines">@@ -18,29 +14,59 @@
</span><span class="cx"> this.current = this.tracks.first();
</span><span class="cx">
</span><span class="cx"> if ( 'audio' === this.data.type ) {
</span><del>- this.currentTemplate = wp.template('wp-playlist-current-item');
</del><ins>+ this.currentTemplate = wp.template( 'wp-playlist-current-item' );
</ins><span class="cx"> this.currentNode = this.$( '.wp-playlist-current-item' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this.renderCurrent();
</span><span class="cx">
</span><span class="cx"> if ( this.data.tracklist ) {
</span><ins>+ this.itemTemplate = wp.template( 'wp-playlist-item' );
</ins><span class="cx"> this.playingClass = 'wp-playlist-playing';
</span><span class="cx"> this.renderTracks();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- this.playerNode.attr( 'src', this.current.get('src') );
</del><ins>+ this.playerNode.attr( 'src', this.current.get( 'src' ) );
</ins><span class="cx">
</span><del>- _.bindAll( this, 'bindPlayer', 'ended', 'clickTrack' );
</del><ins>+ _.bindAll( this, 'bindPlayer', 'bindResetPlayer', 'setPlayer', 'ended', 'clickTrack' );
</ins><span class="cx">
</span><span class="cx"> if ( ! _.isUndefined( window._wpmejsSettings ) ) {
</span><del>- settings.pluginPath = _wpmejsSettings.pluginPath;
</del><ins>+ this.settings.pluginPath = _wpmejsSettings.pluginPath;
</ins><span class="cx"> }
</span><del>- settings.success = this.bindPlayer;
</del><ins>+ this.settings.success = this.bindPlayer;
+ this.setPlayer();
+ },
</ins><span class="cx">
</span><del>- this._player = new MediaElementPlayer( this.playerNode.get(0), settings );
</del><ins>+ bindPlayer : function (mejs) {
+ this.player = mejs;
+ this.player.addEventListener( 'ended', this.ended );
</ins><span class="cx"> },
</span><span class="cx">
</span><ins>+ bindResetPlayer : function (mejs) {
+ this.bindPlayer( mejs );
+ this.playCurrentSrc();
+ },
+
+ setPlayer: function () {
+ if ( this._player ) {
+ this._player.pause();
+ this._player.remove();
+ this.playerNode = this.$( this.data.type );
+ this.playerNode.prop( 'src', this.current.get( 'src' ) );
+ this.settings.success = this.bindResetPlayer;
+ }
+ /**
+ * This is also our bridge to the outside world
+ */
+ this._player = new MediaElementPlayer( this.playerNode.get(0), this.settings );
+ },
+
+ playCurrentSrc : function () {
+ this.renderCurrent();
+ this.player.load();
+ this.player.play();
+ },
+
</ins><span class="cx"> renderCurrent : function () {
</span><span class="cx"> var dimensions;
</span><span class="cx"> if ( 'video' === this.data.type ) {
</span><span class="lines">@@ -79,11 +105,6 @@
</span><span class="cx"> 'click .wp-playlist-prev' : 'prev'
</span><span class="cx"> },
</span><span class="cx">
</span><del>- bindPlayer : function (mejs) {
- this.player = mejs;
- this.player.addEventListener( 'ended', this.ended );
- },
-
</del><span class="cx"> clickTrack : function (e) {
</span><span class="cx"> this.index = this.$( '.wp-playlist-item' ).index( e.currentTarget );
</span><span class="cx"> this.setCurrent();
</span><span class="lines">@@ -110,10 +131,17 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> loadCurrent : function () {
</span><ins>+ var last = this.playerNode.attr( 'src' ).split('.').pop(),
+ current = this.current.get( 'src' ).split('.').pop();
+
</ins><span class="cx"> this.player.pause();
</span><del>- this.playerNode.attr( 'src', this.current.get( 'src' ) );
- this.renderCurrent();
- this.player.load();
</del><ins>+
+ if ( last !== current ) {
+ this.setPlayer();
+ } else {
+ this.playerNode.prop( 'src', this.current.get( 'src' ) );
+ this.playCurrentSrc();
+ }
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> setCurrent : function () {
</span><span class="lines">@@ -127,7 +155,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this.loadCurrent();
</span><del>- this.player.play();
</del><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media.php (27870 => 27871)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media.php 2014-03-31 07:29:29 UTC (rev 27870)
+++ trunk/src/wp-includes/media.php 2014-03-31 15:34:23 UTC (rev 27871)
</span><span class="lines">@@ -2529,8 +2529,6 @@
</span><span class="cx"> 'suggestedWidth' => __( 'Suggested width is %d pixels.' ),
</span><span class="cx"> 'suggestedHeight' => __( 'Suggested height is %d pixels.' ),
</span><span class="cx">
</span><del>- 'mediaHTML5Text' => __( 'Add alternate sources for maximum HTML5 playback:' ),
-
</del><span class="cx"> // Edit Audio
</span><span class="cx"> 'audioDetailsTitle' => __( 'Audio Details' ),
</span><span class="cx"> 'audioReplaceTitle' => __( 'Replace Audio' ),
</span></span></pre>
</div>
</div>
</body>
</html>