<!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>[28247] branches/3.9: Add a compatibility layer in wp-playlist.js to avoid VM errors from MediaElement's plugin bridge in the TinyMCE views for playlists by suppressing playback for files whose mime-type is not supported in the user's browser natively.</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/28247">28247</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-05-02 17:01:17 +0000 (Fri, 02 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a compatibility layer in wp-playlist.js to avoid VM errors from MediaElement's plugin bridge in the TinyMCE views for playlists by suppressing playback for files whose mime-type is not supported in the user's browser natively.
Merges <a href="http://core.trac.wordpress.org/changeset/28171">[28171]</a> to the 3.9 branch.
props wonderboymusic.
fixes <a href="http://core.trac.wordpress.org/ticket/27892">#27892</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches39srcwpincludesjsmceviewjs">branches/3.9/src/wp-includes/js/mce-view.js</a></li>
<li><a href="#branches39srcwpincludesjsmediaelementwpmediaelementcss">branches/3.9/src/wp-includes/js/mediaelement/wp-mediaelement.css</a></li>
<li><a href="#branches39srcwpincludesjsmediaelementwpplaylistjs">branches/3.9/src/wp-includes/js/mediaelement/wp-playlist.js</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches39">branches/3.9/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx">Index: branches/3.9
</span><span class="cx">===================================================================
</span><del>--- branches/3.9 2014-05-02 16:59:47 UTC (rev 28246)
</del><ins>+++ branches/3.9 2014-05-02 17:01:17 UTC (rev 28247)
</ins><a id="branches39"></a>
<div class="propset"><h4>Property changes: branches/3.9</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> /branches/3.1:18031
</span><span class="cx"> /branches/3.3:20543
</span><span class="cx"> /branches/3.4:21757
</span><del>-/trunk:18512,28158,28161,28163,28165-28166,28168,28172-28174,28176-28181,28184-28187,28190,28193,28195,28203,28219,28223
</del><ins>+/trunk:18512,28158,28161,28163,28165-28166,28168,28171-28174,28176-28181,28184-28187,28190,28193,28195,28203,28219,28223
</ins><span class="cx">\ No newline at end of property
</span><a id="branches39srcwpincludesjsmceviewjs"></a>
<div class="modfile"><h4>Modified: branches/3.9/src/wp-includes/js/mce-view.js (28246 => 28247)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.9/src/wp-includes/js/mce-view.js 2014-05-02 16:59:47 UTC (rev 28246)
+++ branches/3.9/src/wp-includes/js/mce-view.js 2014-05-02 17:01:17 UTC (rev 28247)
</span><span class="lines">@@ -611,7 +611,7 @@
</span><span class="cx"> metadata: this.data
</span><span class="cx"> });
</span><span class="cx">
</span><del>- this.player = p._player;
</del><ins>+ this.player = p.player;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="branches39srcwpincludesjsmediaelementwpmediaelementcss"></a>
<div class="modfile"><h4>Modified: branches/3.9/src/wp-includes/js/mediaelement/wp-mediaelement.css (28246 => 28247)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.9/src/wp-includes/js/mediaelement/wp-mediaelement.css 2014-05-02 16:59:47 UTC (rev 28246)
+++ branches/3.9/src/wp-includes/js/mediaelement/wp-mediaelement.css 2014-05-02 17:01:17 UTC (rev 28247)
</span><span class="lines">@@ -218,4 +218,8 @@
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> text-overflow: ellipsis;
</span><span class="cx"> white-space: nowrap;
</span><ins>+}
+
+.wp-audio-playlist .me-cannotplay span {
+ padding: 5px 15px;
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branches39srcwpincludesjsmediaelementwpplaylistjs"></a>
<div class="modfile"><h4>Modified: branches/3.9/src/wp-includes/js/mediaelement/wp-playlist.js (28246 => 28247)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.9/src/wp-includes/js/mediaelement/wp-playlist.js 2014-05-02 16:59:47 UTC (rev 28246)
+++ branches/3.9/src/wp-includes/js/mediaelement/wp-playlist.js 2014-05-02 17:01:17 UTC (rev 28247)
</span><span class="lines">@@ -7,6 +7,7 @@
</span><span class="cx"> initialize : function (options) {
</span><span class="cx"> this.index = 0;
</span><span class="cx"> this.settings = {};
</span><ins>+ this.compatMode = $( 'body' ).hasClass( 'wp-admin' ) && $( '#content_ifr' ).length;
</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">@@ -26,7 +27,9 @@
</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>+ if ( this.isCompatibleSrc() ) {
+ this.playerNode.attr( 'src', this.current.get( 'src' ) );
+ }
</ins><span class="cx">
</span><span class="cx"> _.bindAll( this, 'bindPlayer', 'bindResetPlayer', 'setPlayer', 'ended', 'clickTrack' );
</span><span class="cx">
</span><span class="lines">@@ -38,34 +41,58 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> bindPlayer : function (mejs) {
</span><del>- this.player = mejs;
- this.player.addEventListener( 'ended', this.ended );
</del><ins>+ this.mejs = mejs;
+ this.mejs.addEventListener( 'ended', this.ended );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> bindResetPlayer : function (mejs) {
</span><span class="cx"> this.bindPlayer( mejs );
</span><del>- this.playCurrentSrc();
</del><ins>+ if ( this.isCompatibleSrc() ) {
+ this.playCurrentSrc();
+ }
</ins><span class="cx"> },
</span><span class="cx">
</span><del>- setPlayer: function () {
- if ( this._player ) {
- this._player.pause();
- this._player.remove();
</del><ins>+ isCompatibleSrc: function () {
+ var testNode;
+
+ if ( this.compatMode ) {
+ testNode = $( '<span><source type="' + this.current.get( 'type' ) + '" /></span>' );
+
+ if ( ! wp.media.mixin.isCompatible( testNode ) ) {
+ this.playerNode.removeAttr( 'src' );
+ this.playerNode.removeAttr( 'poster' );
+ return;
+ }
+ }
+
+ return true;
+ },
+
+ setPlayer: function (force) {
+ if ( this.player ) {
+ this.player.pause();
+ this.player.remove();
</ins><span class="cx"> this.playerNode = this.$( this.data.type );
</span><del>- this.playerNode.attr( 'src', this.current.get( 'src' ) );
</del><ins>+ }
+
+ if (force) {
+ if ( this.isCompatibleSrc() ) {
+ this.playerNode.attr( 'src', this.current.get( 'src' ) );
+ }
</ins><span class="cx"> this.settings.success = this.bindResetPlayer;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * This is also our bridge to the outside world
</span><span class="cx"> */
</span><del>- this._player = new MediaElementPlayer( this.playerNode.get(0), this.settings );
</del><ins>+ this.player = new MediaElementPlayer( this.playerNode.get(0), this.settings );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> playCurrentSrc : function () {
</span><span class="cx"> this.renderCurrent();
</span><del>- this.player.setSrc( this.playerNode.attr( 'src' ) );
- this.player.load();
- this.player.play();
</del><ins>+ this.mejs.setSrc( this.playerNode.attr( 'src' ) );
+ this.mejs.load();
+ this.mejs.play();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> renderCurrent : function () {
</span><span class="lines">@@ -134,14 +161,14 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> loadCurrent : function () {
</span><del>- var last = this.playerNode.attr( 'src' ).split('.').pop(),
</del><ins>+ var last = this.playerNode.attr( 'src' ) && this.playerNode.attr( 'src' ).split('.').pop(),
</ins><span class="cx"> current = this.current.get( 'src' ).split('.').pop();
</span><span class="cx">
</span><del>- this.player.pause();
</del><ins>+ this.mejs && this.mejs.pause();
</ins><span class="cx">
</span><span class="cx"> if ( last !== current ) {
</span><del>- this.setPlayer();
- } else {
</del><ins>+ this.setPlayer( true );
+ } else if ( this.isCompatibleSrc() ) {
</ins><span class="cx"> this.playerNode.attr( 'src', this.current.get( 'src' ) );
</span><span class="cx"> this.playCurrentSrc();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>