<!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>[27538] trunk/src/wp-includes/js: Move `removePlayer()` and `unsetPlayer()` to `wp.media.mixin` so that other classes can take advantage of them.</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/27538">27538</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-03-14 13:47:24 +0000 (Fri, 14 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move `removePlayer()` and `unsetPlayer()` to `wp.media.mixin` so that other classes can take advantage of them.
* `removePlayer()` is an alternative to MediaElement's player removal method that does not re-add the audio|video element back to the DOM.
* `unsetPlayer()` will check for an existing `player` property on the passed instance and pause all players before calling `unsetPlayer()`
See <a href="http://core.trac.wordpress.org/ticket/27389">#27389</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmediaeditorjs">trunk/src/wp-includes/js/media-editor.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjsmediaeditorjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-editor.js (27537 => 27538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-editor.js 2014-03-14 13:16:07 UTC (rev 27537)
+++ trunk/src/wp-includes/js/media-editor.js 2014-03-14 13:47:24 UTC (rev 27538)
</span><span class="lines">@@ -305,6 +305,53 @@
</span><span class="cx"> window.mejs.players[p].pause();
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ },
+
+ /**
+ * 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.
+ */
+ removePlayer: 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 window.mejs.players[t.id];
+
+ t.container.remove();
+ t.globalUnbind();
+ delete t.node.player;
+ },
+
+ /**
+ * Allows any class that has set 'player' to a MediaElementPlayer
+ * instance to remove the player when listening to events.
+ *
+ * Examples: modal closes, shortcode properties are removed, etc.
+ */
+ unsetPlayer : function() {
+ if ( this.player ) {
+ wp.media.mixin.pauseAllPlayers();
+ wp.media.mixin.removePlayer.apply( this );
+ this.player = false;
+ }
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (27537 => 27538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-03-14 13:16:07 UTC (rev 27537)
+++ trunk/src/wp-includes/js/media-views.js 2014-03-14 13:47:24 UTC (rev 27538)
</span><span class="lines">@@ -6547,11 +6547,11 @@
</span><span class="cx"> */
</span><span class="cx"> media.view.MediaDetails = media.view.Settings.AttachmentDisplay.extend({
</span><span class="cx"> initialize: function() {
</span><del>- _.bindAll(this, 'success', 'unsetPlayer');
</del><ins>+ _.bindAll(this, 'success');
</ins><span class="cx">
</span><del>- this.listenTo( this.controller, 'close', this.unsetPlayer );
</del><ins>+ this.listenTo( this.controller, 'close', media.mixin.unsetPlayer );
</ins><span class="cx"> this.on( 'ready', this.setPlayer );
</span><del>- this.on( 'media:setting:remove', this.unsetPlayer );
</del><ins>+ this.on( 'media:setting:remove', media.mixin.unsetPlayer, this );
</ins><span class="cx"> this.on( 'media:setting:remove', this.render );
</span><span class="cx"> this.on( 'media:setting:remove', this.setPlayer );
</span><span class="cx"> this.events = _.extend( this.events, {
</span><span class="lines">@@ -6606,49 +6606,6 @@
</span><span class="cx"> return this;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- /**
- * 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.
- */
- removePlayer: 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 window.mejs.players[t.id];
-
- t.container.remove();
- t.globalUnbind();
- delete t.node.player;
- },
-
- unsetPlayer : function() {
- if ( this.player ) {
- if ( _.isUndefined( this.mejs.pluginType ) ) {
- this.mejs.pause();
- }
- this.removePlayer();
- this.player = false;
- }
- },
-
</del><span class="cx"> success : function (mejs) {
</span><span class="cx"> var autoplay = mejs.attributes.autoplay && 'false' !== mejs.attributes.autoplay;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>