<!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>[27537] trunk/src/wp-includes/js/media-editor.js: Rather than extending `wp.media.mixin`, only borrow `coerce` when necessary in `wp.media.audio|video|collection`.</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/27537">27537</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-03-14 13:16:07 +0000 (Fri, 14 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rather than extending `wp.media.mixin`, only borrow `coerce` when necessary in `wp.media.audio|video|collection`. `wp.media.mixin` will make sense to be mixed in for classes that expect to interact with the player. More universal methods can be added and inherited by all those who extend their prototype with it.
Assuming someone had implemented players in the editor, pause all players when switching between editor tabs. A method, `pauseAllPlayers`, has been added to `wp.media.mixin`.
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>
</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 (27536 => 27537)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-editor.js 2014-03-14 12:59:28 UTC (rev 27536)
+++ trunk/src/wp-includes/js/media-editor.js 2014-03-14 13:16:07 UTC (rev 27537)
</span><span class="lines">@@ -296,13 +296,23 @@
</span><span class="cx"> attrs[ key ] = false;
</span><span class="cx"> }
</span><span class="cx"> return attrs[ key ];
</span><ins>+ },
+
+ pauseAllPlayers: function () {
+ var p;
+ if ( window.mejs && window.mejs.players ) {
+ for ( p in window.mejs.players ) {
+ window.mejs.players[p].pause();
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> wp.media.collection = function(attributes) {
</span><span class="cx"> var collections = {};
</span><span class="cx">
</span><del>- return _.extend( attributes, wp.media.mixin, {
</del><ins>+ return _.extend( attributes, {
+ coerce : wp.media.mixin.coerce,
</ins><span class="cx"> /**
</span><span class="cx"> * Retrieve attachments based on the properties of the passed shortcode
</span><span class="cx"> *
</span><span class="lines">@@ -558,7 +568,9 @@
</span><span class="cx"> /**
</span><span class="cx"> * @namespace
</span><span class="cx"> */
</span><del>- wp.media.audio = _.extend({
</del><ins>+ wp.media.audio = {
+ coerce : wp.media.mixin.coerce,
+
</ins><span class="cx"> defaults : {
</span><span class="cx"> id : wp.media.view.settings.post.id,
</span><span class="cx"> src : '',
</span><span class="lines">@@ -597,12 +609,14 @@
</span><span class="cx"> attrs: shortcode
</span><span class="cx"> });
</span><span class="cx"> }
</span><del>- }, wp.media.mixin);
</del><ins>+ };
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @namespace
</span><span class="cx"> */
</span><del>- wp.media.video = _.extend({
</del><ins>+ wp.media.video = {
+ coerce : wp.media.mixin.coerce,
+
</ins><span class="cx"> defaults : {
</span><span class="cx"> id : wp.media.view.settings.post.id,
</span><span class="cx"> src : '',
</span><span class="lines">@@ -649,7 +663,7 @@
</span><span class="cx"> content: content
</span><span class="cx"> });
</span><span class="cx"> }
</span><del>- }, wp.media.mixin);
</del><ins>+ };
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * wp.media.featuredImage
</span><span class="lines">@@ -1111,38 +1125,40 @@
</span><span class="cx"> * @global wp.media.view.l10n
</span><span class="cx"> */
</span><span class="cx"> init: function() {
</span><del>- $(document.body).on( 'click', '.insert-media', function( event ) {
- var elem = $( event.currentTarget ),
- editor = elem.data('editor'),
- options = {
- frame: 'post',
- state: 'insert',
- title: wp.media.view.l10n.addMedia,
- multiple: true
- };
</del><ins>+ $(document.body)
+ .on( 'click', '.insert-media', function( event ) {
+ var elem = $( event.currentTarget ),
+ editor = elem.data('editor'),
+ options = {
+ frame: 'post',
+ state: 'insert',
+ title: wp.media.view.l10n.addMedia,
+ multiple: true
+ };
</ins><span class="cx">
</span><del>- event.preventDefault();
</del><ins>+ event.preventDefault();
</ins><span class="cx">
</span><del>- // Remove focus from the `.insert-media` button.
- // Prevents Opera from showing the outline of the button
- // above the modal.
- //
- // See: http://core.trac.wordpress.org/ticket/22445
- elem.blur();
</del><ins>+ // Remove focus from the `.insert-media` button.
+ // Prevents Opera from showing the outline of the button
+ // above the modal.
+ //
+ // See: http://core.trac.wordpress.org/ticket/22445
+ elem.blur();
</ins><span class="cx">
</span><del>- if ( elem.hasClass( 'gallery' ) ) {
- options.state = 'gallery';
- options.title = wp.media.view.l10n.createGalleryTitle;
- } else if ( elem.hasClass( 'playlist' ) ) {
- options.state = 'playlist';
- options.title = wp.media.view.l10n.createPlaylistTitle;
- } else if ( elem.hasClass( 'video-playlist' ) ) {
- options.state = 'video-playlist';
- options.title = wp.media.view.l10n.createVideoPlaylistTitle;
- }
</del><ins>+ if ( elem.hasClass( 'gallery' ) ) {
+ options.state = 'gallery';
+ options.title = wp.media.view.l10n.createGalleryTitle;
+ } else if ( elem.hasClass( 'playlist' ) ) {
+ options.state = 'playlist';
+ options.title = wp.media.view.l10n.createPlaylistTitle;
+ } else if ( elem.hasClass( 'video-playlist' ) ) {
+ options.state = 'video-playlist';
+ options.title = wp.media.view.l10n.createVideoPlaylistTitle;
+ }
</ins><span class="cx">
</span><del>- wp.media.editor.open( editor, options );
- });
</del><ins>+ wp.media.editor.open( editor, options );
+ })
+ .on( 'click', '.wp-switch-editor', wp.media.mixin.pauseAllPlayers );
</ins><span class="cx">
</span><span class="cx"> // Initialize and render the Editor drag-and-drop uploader.
</span><span class="cx"> new wp.media.view.EditorUploader().render();
</span></span></pre>
</div>
</div>
</body>
</html>