<!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>[27450] trunk/src/wp-includes/js: Support the `autoplay` attribute, even when the plugin type for a MediaElement instance is Flash.</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/27450">27450</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-03-07 05:51:25 +0000 (Fri, 07 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Support the `autoplay` attribute, even when the plugin type for a MediaElement instance is Flash. In the media modal, `wp.media.view.VideoDetails` and `wp.media.view.AudioDetails` now extend a unified `wp.media.view.MediaDetails` class which contains all of the player creation and destruction logic. The `remove()` method mimics the `mejs.MediaElementPlayer.remove()` method, but does not re-add the audio/video tag to the DOM. The MEjs method is especially problematic when the tag has `autoplay="true"` and the view has been detached but not destroyed.
Fixes <a href="http://core.trac.wordpress.org/ticket/25077">#25077</a>.
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="#trunksrcwpincludesjsmediaelementwpmediaelementjs">trunk/src/wp-includes/js/mediaelement/wp-mediaelement.js</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 (27449 => 27450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-03-07 03:09:00 UTC (rev 27449)
+++ trunk/src/wp-includes/js/media-views.js 2014-03-07 05:51:25 UTC (rev 27450)
</span><span class="lines">@@ -6370,7 +6370,7 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * wp.media.view.AudioDetails
</del><ins>+ * wp.media.view.MediaDetails
</ins><span class="cx"> *
</span><span class="cx"> * @contructor
</span><span class="cx"> * @augments wp.media.view.Settings.AttachmentDisplay
</span><span class="lines">@@ -6379,12 +6379,9 @@
</span><span class="cx"> * @augments wp.Backbone.View
</span><span class="cx"> * @augments Backbone.View
</span><span class="cx"> */
</span><del>- media.view.AudioDetails = media.view.Settings.AttachmentDisplay.extend({
- className: 'audio-details',
- template: media.template('audio-details'),
-
</del><ins>+ media.view.MediaDetails = media.view.Settings.AttachmentDisplay.extend({
</ins><span class="cx"> initialize: function() {
</span><del>- _.bindAll(this, 'player', 'close');
</del><ins>+ _.bindAll(this, 'success', 'close');
</ins><span class="cx">
</span><span class="cx"> this.listenTo( this.controller, 'close', this.close );
</span><span class="cx">
</span><span class="lines">@@ -6403,17 +6400,75 @@
</span><span class="cx"> }, this.options );
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ prepareSrc : function (media) {
+ media.src = [
+ media.src,
+ media.src.indexOf('?') > -1 ? '&' : '?',
+ (new Date()).getTime()
+ ].join('');
+
+ return media;
+ },
+
+ setPlayer : function () {
+ this.player = false;
+ },
+
+ /**
+ * Override the MediaElement method for removing a player.
+ * MediaElement tries to pull the audio/video tag out of
+ * its container and re-add it to the DOM.
+ */
+ remove: function() {
+ var t = this.player, featureIndex, feature;
+
+ // invoke features cleanup
+ for ( featureIndex in t.options.features ) {
+ feature = t.options.features[featureIndex];
+ if ( t['clean' + feature] ) {
+ try {
+ t['clean' + feature](t);
+ } catch (e) {}
+ }
+ }
+
+ if ( ! t.isDynamic ) {
+ t.$node.remove();
+ }
+
+ if ( 'native' !== t.media.pluginType ) {
+ t.media.remove();
+ }
+
+ delete mejs.players[t.id];
+
+ t.container.remove();
+ t.globalUnbind();
+ delete t.node.player;
+ },
+
</ins><span class="cx"> close : function() {
</span><del>- this.mejs.pause();
</del><ins>+ if ( this.player ) {
+ this.mejs.pause();
+ this.remove();
+ }
</ins><span class="cx"> },
</span><span class="cx">
</span><del>- player : function (mejs) {
</del><ins>+ success : function (mejs) {
+ var autoplay = mejs.attributes.autoplay && 'false' !== mejs.attributes.autoplay;
+
+ if ( 'flash' === mejs.pluginType && autoplay ) {
+ mejs.addEventListener( 'canplay', function () {
+ mejs.play();
+ }, false );
+ }
+
</ins><span class="cx"> this.mejs = mejs;
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> render: function() {
</span><span class="cx"> var self = this, settings = {
</span><del>- success : this.player
</del><ins>+ success : this.success
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> if ( ! _.isUndefined( window._wpmejsSettings ) ) {
</span><span class="lines">@@ -6423,7 +6478,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.$('.wp-audio-shortcode').get(0), settings );
</del><ins>+ this.setPlayer( settings );
</ins><span class="cx">
</span><span class="cx"> return this;
</span><span class="cx"> },
</span><span class="lines">@@ -6434,73 +6489,52 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * wp.media.view.VideoDetails
</del><ins>+ * wp.media.view.AudioDetails
</ins><span class="cx"> *
</span><span class="cx"> * @contructor
</span><ins>+ * @augments wp.media.view.MediaDetails
</ins><span class="cx"> * @augments wp.media.view.Settings.AttachmentDisplay
</span><span class="cx"> * @augments wp.media.view.Settings
</span><span class="cx"> * @augments wp.media.View
</span><span class="cx"> * @augments wp.Backbone.View
</span><span class="cx"> * @augments Backbone.View
</span><span class="cx"> */
</span><del>- media.view.VideoDetails = media.view.Settings.AttachmentDisplay.extend({
- className: 'video-details',
- template: media.template('video-details'),
</del><ins>+ media.view.AudioDetails = media.view.MediaDetails.extend({
+ className: 'audio-details',
+ template: media.template('audio-details'),
</ins><span class="cx">
</span><del>- initialize: function() {
- _.bindAll(this, 'success');
</del><ins>+ setPlayer: function( settings ) {
+ var audio = this.$('.wp-audio-shortcode').get(0);
</ins><span class="cx">
</span><del>- this.listenTo( this.controller, 'close', this.close );
</del><ins>+ audio = this.prepareSrc( audio );
</ins><span class="cx">
</span><del>- media.view.Settings.AttachmentDisplay.prototype.initialize.apply( this, arguments );
- },
</del><ins>+ this.player = new MediaElementPlayer( audio, settings );
+ return this;
+ }
+ });
</ins><span class="cx">
</span><del>- prepare: function() {
- var attachment = false;
</del><ins>+ /**
+ * wp.media.view.VideoDetails
+ *
+ * @contructor
+ * @augments wp.media.view.MediaDetails
+ * @augments wp.media.view.Settings.AttachmentDisplay
+ * @augments wp.media.view.Settings
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+ media.view.VideoDetails = media.view.MediaDetails.extend({
+ className: 'video-details',
+ template: media.template('video-details'),
</ins><span class="cx">
</span><del>- if ( this.model.attachment ) {
- attachment = this.model.attachment.toJSON();
- }
- return _.defaults({
- model: this.model.toJSON(),
- attachment: attachment
- }, this.options );
- },
</del><ins>+ setPlayer: function( settings ) {
+ var video = this.$('.wp-video-shortcode').get(0);
</ins><span class="cx">
</span><del>- close : function() {
- this.mejs.pause();
- this.player.remove();
- },
</del><ins>+ video = this.prepareSrc( video );
</ins><span class="cx">
</span><del>- success : function (mejs) {
- this.mejs = mejs;
- },
-
- render: function() {
- var video, self = this, settings = {
- success : this.success
- };
-
- if ( ! _.isUndefined( window._wpmejsSettings ) ) {
- settings.pluginPath = _wpmejsSettings.pluginPath;
- }
-
- media.view.Settings.AttachmentDisplay.prototype.render.apply( this, arguments );
- setTimeout( function() { self.resetFocus(); }, 10 );
-
- video = this.$('.wp-video-shortcode').get(0);
- video.src = [
- video.src,
- video.src.indexOf('?') > -1 ? '&' : '?',
- (new Date()).getTime()
- ].join('');
-
</del><span class="cx"> this.player = new MediaElementPlayer( video, settings );
</span><span class="cx"> return this;
</span><del>- },
-
- resetFocus: function() {
- this.$( '.embed-media-settings' ).scrollTop( 0 );
</del><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaelementwpmediaelementjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/mediaelement/wp-mediaelement.js (27449 => 27450)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/mediaelement/wp-mediaelement.js 2014-03-07 03:09:00 UTC (rev 27449)
+++ trunk/src/wp-includes/js/mediaelement/wp-mediaelement.js 2014-03-07 05:51:25 UTC (rev 27450)
</span><span class="lines">@@ -7,9 +7,19 @@
</span><span class="cx"> $(function () {
</span><span class="cx"> var settings = {};
</span><span class="cx">
</span><del>- if ( typeof _wpmejsSettings !== 'undefined' )
</del><ins>+ if ( typeof _wpmejsSettings !== 'undefined' ) {
</ins><span class="cx"> settings.pluginPath = _wpmejsSettings.pluginPath;
</span><ins>+ }
</ins><span class="cx">
</span><ins>+ settings.success = function (mejs) {
+ var autoplay = mejs.attributes.autoplay && 'false' !== mejs.attributes.autoplay;
+ if ( 'flash' === mejs.pluginType && autoplay ) {
+ mejs.addEventListener( 'canplay', function () {
+ mejs.play();
+ }, false );
+ }
+ };
+
</ins><span class="cx"> $('.wp-audio-shortcode, .wp-video-shortcode').mediaelementplayer( settings );
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>