<!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>[29189] trunk/src/wp-includes/js: Cleanup after [29179]:</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/29189">29189</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-07-16 16:13:47 +0000 (Wed, 16 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cleanup after <a href="http://core.trac.wordpress.org/changeset/29179">[29179]</a>:
* Cleanup players when the editor is hidden - window scope is unique to each frame
* Add the editor body class to each iframe sandbox
* Remove unneeded code from `wp-mediaelement.js`
See <a href="http://core.trac.wordpress.org/ticket/28905">#28905</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmceviewjs">trunk/src/wp-includes/js/mce-view.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="trunksrcwpincludesjsmceviewjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/mce-view.js (29188 => 29189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/mce-view.js 2014-07-16 15:53:14 UTC (rev 29188)
+++ trunk/src/wp-includes/js/mce-view.js 2014-07-16 16:13:47 UTC (rev 29189)
</span><span class="lines">@@ -130,7 +130,9 @@
</span><span class="cx">
</span><span class="cx"> node = $( node ).find( '.wpview-content' )[0];
</span><span class="cx">
</span><del>- node.innerHTML = '';
</del><ins>+ if ( node ) {
+ node.innerHTML = '';
+ }
</ins><span class="cx">
</span><span class="cx"> iframe = dom.add( node, 'iframe', {
</span><span class="cx"> src: tinymce.Env.ie ? 'javascript:""' : '',
</span><span class="lines">@@ -152,7 +154,7 @@
</span><span class="cx"> '<head>' +
</span><span class="cx"> '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />' +
</span><span class="cx"> '</head>' +
</span><del>- '<body style="padding: 0; margin: 0;" class="' + /* editor.getBody().className + */ '">' +
</del><ins>+ '<body data-context="iframe-sandbox" style="padding: 0; margin: 0;" class="' + editor.getBody().className + '">' +
</ins><span class="cx"> content +
</span><span class="cx"> '</body>' +
</span><span class="cx"> '</html>'
</span><span class="lines">@@ -507,11 +509,14 @@
</span><span class="cx"> this.shortcode = options.shortcode;
</span><span class="cx"> this.fetching = false;
</span><span class="cx">
</span><del>- _.bindAll( this, 'createIframe', 'setNode', 'fetch' );
</del><ins>+ _.bindAll( this, 'createIframe', 'setNode', 'fetch', 'pausePlayers' );
</ins><span class="cx"> $( this ).on( 'ready', this.setNode );
</span><span class="cx"> },
</span><span class="cx">
</span><del>- setNode: function () {
</del><ins>+ setNode: function ( event, editor, node ) {
+ this.node = node;
+ editor.on( 'hide', this.pausePlayers );
+
</ins><span class="cx"> if ( this.parsed ) {
</span><span class="cx"> this.createIframe( this.parsed );
</span><span class="cx"> } else if ( ! this.fetching ) {
</span><span class="lines">@@ -564,6 +569,16 @@
</span><span class="cx"> return ' ';
</span><span class="cx"> }
</span><span class="cx"> return this.parsed;
</span><ins>+ },
+
+ pausePlayers: function() {
+ var p, win = $( 'iframe', this.node ).get(0).contentWindow;
+ if ( win.mejs ) {
+ for ( p in win.mejs.players ) {
+ win.mejs.players[p].pause();
+ win.mejs.players[p].remove();
+ }
+ }
</ins><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 (29188 => 29189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/mediaelement/wp-mediaelement.js 2014-07-16 15:53:14 UTC (rev 29188)
+++ trunk/src/wp-includes/js/mediaelement/wp-mediaelement.js 2014-07-16 16:13:47 UTC (rev 29189)
</span><span class="lines">@@ -7,10 +7,6 @@
</span><span class="cx"> $(function () {
</span><span class="cx"> var settings = {};
</span><span class="cx">
</span><del>- if ( $( document.body ).hasClass( 'mce-content-body' ) ) {
- return;
- }
-
</del><span class="cx"> if ( typeof _wpmejsSettings !== 'undefined' ) {
</span><span class="cx"> settings = _wpmejsSettings;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>