<!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>[28364] trunk/src/wp-includes/js: When pausing "all" players attached to MCE views, don't reach into global scope and pause "every" player.</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/28364">28364</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-11 02:06:36 +0000 (Sun, 11 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>When pausing "all" players attached to MCE views, don't reach into global scope and pause "every" player. Only pause the players bound to MCE views.
Fixes <a href="http://core.trac.wordpress.org/ticket/27971">#27971</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmceviewjs">trunk/src/wp-includes/js/mce-view.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaaudiovideojs">trunk/src/wp-includes/js/media-audiovideo.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjsmceviewjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/mce-view.js (28363 => 28364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/mce-view.js 2014-05-11 01:27:29 UTC (rev 28363)
+++ trunk/src/wp-includes/js/mce-view.js 2014-05-11 02:06:36 UTC (rev 28364)
</span><span class="lines">@@ -371,7 +371,7 @@
</span><span class="cx"> self = this,
</span><span class="cx"> frame, data, callback;
</span><span class="cx">
</span><del>- wp.media.mixin.pauseAllPlayers();
</del><ins>+ $( document ).trigger( 'media:edit' );
</ins><span class="cx">
</span><span class="cx"> data = window.decodeURIComponent( $( node ).attr('data-wpview-text') );
</span><span class="cx"> frame = media.edit( data );
</span><span class="lines">@@ -407,8 +407,10 @@
</span><span class="cx"> initialize: function( options ) {
</span><span class="cx"> this.players = [];
</span><span class="cx"> this.shortcode = options.shortcode;
</span><del>- _.bindAll( this, 'setPlayer' );
- $(this).on( 'ready', this.setPlayer );
</del><ins>+ _.bindAll( this, 'setPlayer', 'pausePlayers' );
+ $( this ).on( 'ready', this.setPlayer );
+ $( 'body' ).on( 'click', '.wp-switch-editor', this.pausePlayers );
+ $( document ).on( 'media:edit', this.pausePlayers );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -524,6 +526,10 @@
</span><span class="cx"> this.data = {};
</span><span class="cx"> this.attachments = [];
</span><span class="cx"> this.shortcode = options.shortcode;
</span><ins>+
+ $( 'body' ).on( 'click', '.wp-switch-editor', this.pausePlayers );
+ $( document ).on( 'media:edit', this.pausePlayers );
+
</ins><span class="cx"> this.fetch();
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -687,8 +693,8 @@
</span><span class="cx"> },
</span><span class="cx"> unbind: function() {
</span><span class="cx"> var self = this;
</span><del>- this.pauseAllPlayers();
</del><span class="cx"> _.each( this.players, function ( player ) {
</span><ins>+ player.pause();
</ins><span class="cx"> self.removePlayer( player );
</span><span class="cx"> } );
</span><span class="cx"> this.players = [];
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaaudiovideojs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-audiovideo.js (28363 => 28364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-audiovideo.js 2014-05-11 01:27:29 UTC (rev 28363)
+++ trunk/src/wp-includes/js/media-audiovideo.js 2014-05-11 02:06:36 UTC (rev 28364)
</span><span class="lines">@@ -27,6 +27,15 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Pauses the current object's instances of MediaElementPlayer
+ */
+ pausePlayers: function() {
+ _.each( this.players, function (player) {
+ player.pause();
+ } );
+ },
+
+ /**
</ins><span class="cx"> * Utility to identify the user's browser
</span><span class="cx"> */
</span><span class="cx"> ua: {
</span><span class="lines">@@ -168,8 +177,8 @@
</span><span class="cx"> */
</span><span class="cx"> unsetPlayers : function() {
</span><span class="cx"> if ( this.players && this.players.length ) {
</span><del>- wp.media.mixin.pauseAllPlayers();
</del><span class="cx"> _.each( this.players, function (player) {
</span><ins>+ player.pause();
</ins><span class="cx"> wp.media.mixin.removePlayer( player );
</span><span class="cx"> } );
</span><span class="cx"> this.players = [];
</span><span class="lines">@@ -911,7 +920,6 @@
</span><span class="cx"> */
</span><span class="cx"> function init() {
</span><span class="cx"> $(document.body)
</span><del>- .on( 'click', '.wp-switch-editor', wp.media.mixin.pauseAllPlayers )
</del><span class="cx"> .on( 'click', '.add-media-source', function( e ) {
</span><span class="cx"> media.frame.lastMime = $( e.currentTarget ).data( 'mime' );
</span><span class="cx"> media.frame.setState( 'add-' + media.frame.defaults.id + '-source' );
</span></span></pre>
</div>
</div>
</body>
</html>