<!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>[27322] trunk/src/wp-includes/js/media-views.js: Rather than extending `media.controller.CollectionAdd` 3 times, make it a constructor that dynamically extends `media.controller.Library` and use instances of it instead.</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/27322">27322</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-02-27 23:03:02 +0000 (Thu, 27 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rather than extending `media.controller.CollectionAdd` 3 times, make it a constructor that dynamically extends `media.controller.Library` and use instances of it instead.
See <a href="http://core.trac.wordpress.org/ticket/26631">#26631</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.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 (27321 => 27322)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-02-27 21:50:40 UTC (rev 27321)
+++ trunk/src/wp-includes/js/media-views.js 2014-02-27 23:03:02 UTC (rev 27322)
</span><span class="lines">@@ -867,39 +867,35 @@
</span><span class="cx"> /**
</span><span class="cx"> * wp.media.controller.CollectionAdd
</span><span class="cx"> *
</span><del>- * @static
- * @param {string} prop The shortcode slug
- * @param {object} args
- * @returns {wp.media.controller.Library}
</del><ins>+ * @constructor
+ * @augments wp.media.controller.Library
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
</ins><span class="cx"> */
</span><del>- media.controller.CollectionAdd = function ( prop, args ) {
- /**
- * @constructor
- * @augments wp.media.controller.Library
- * @augments wp.media.controller.State
- * @augments Backbone.Model
- */
- return media.controller.Library.extend({
- defaults: _.defaults({
- id: prop + '-library',
- filterable: 'uploaded',
- multiple: 'add',
- menu: prop,
- toolbar: prop + '-add',
- priority: 100,
</del><ins>+ media.controller.CollectionAdd = function (attributes) {
+ var ExtendedLibrary, extended = _.extend( attributes, {
+ defaults: _.defaults( {
+ id: attributes.tag + '-library',
+ title: attributes.title,
+ menu: attributes.tag,
+ toolbar: attributes.tag + '-add',
+ filterable: 'uploaded',
+ multiple: 'add',
+ priority: 100,
</ins><span class="cx"> syncSelection: false
</span><del>- }, args.defaults || {}, media.controller.Library.prototype.defaults ),
</del><ins>+ }, media.controller.Library.prototype.defaults ),
+
</ins><span class="cx"> initialize: function() {
</span><span class="cx"> // If we haven't been provided a `library`, create a `Selection`.
</span><span class="cx"> if ( ! this.get('library') ) {
</span><del>- this.set( 'library', media.query({ type: args.type }) );
</del><ins>+ this.set( 'library', media.query({ type: this.type }) );
</ins><span class="cx"> }
</span><span class="cx"> media.controller.Library.prototype.initialize.apply( this, arguments );
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> activate: function() {
</span><span class="cx"> var library = this.get('library'),
</span><del>- edit = this.frame.state(prop + '-edit').get('library');
</del><ins>+ edit = this.frame.state( this.tag + '-edit' ).get('library');
</ins><span class="cx">
</span><span class="cx"> if ( this.editLibrary && this.editLibrary !== edit ) {
</span><span class="cx"> library.unobserve( this.editLibrary );
</span><span class="lines">@@ -920,7 +916,10 @@
</span><span class="cx">
</span><span class="cx"> media.controller.Library.prototype.activate.apply( this, arguments );
</span><span class="cx"> }
</span><del>- });
</del><ins>+ } );
+ ExtendedLibrary = media.controller.Library.extend( extended );
+
+ return new ExtendedLibrary();
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // wp.media.controller.GalleryEdit
</span><span class="lines">@@ -933,15 +932,6 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><del>- // wp.media.controller.GalleryAdd
- // ---------------------------------
- media.controller.GalleryAdd = media.controller.CollectionAdd( 'gallery', {
- type: 'image',
- defaults: {
- title: l10n.addToGalleryTitle
- }
- });
-
</del><span class="cx"> // wp.media.controller.PlaylistEdit
</span><span class="cx"> // -------------------------------
</span><span class="cx"> media.controller.PlaylistEdit = media.controller.CollectionEdit( 'playlist', {
</span><span class="lines">@@ -954,15 +944,6 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><del>- // wp.media.controller.PlaylistAdd
- // ---------------------------------
- media.controller.PlaylistAdd = media.controller.CollectionAdd( 'playlist', {
- type: 'audio',
- defaults: {
- title: l10n.addToPlaylistTitle
- }
- });
-
</del><span class="cx"> // wp.media.controller.VideoPlaylistEdit
</span><span class="cx"> // -------------------------------
</span><span class="cx"> media.controller.VideoPlaylistEdit = media.controller.CollectionEdit( 'video-playlist', {
</span><span class="lines">@@ -975,15 +956,6 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><del>- // wp.media.controller.VideoPlaylistAdd
- // ---------------------------------
- media.controller.VideoPlaylistAdd = media.controller.CollectionAdd( 'video-playlist', {
- type: 'video',
- defaults: {
- title: l10n.addToVideoPlaylistTitle
- }
- });
-
</del><span class="cx"> /**
</span><span class="cx"> * wp.media.controller.FeaturedImage
</span><span class="cx"> *
</span><span class="lines">@@ -1810,7 +1782,11 @@
</span><span class="cx"> menu: 'gallery'
</span><span class="cx"> }),
</span><span class="cx">
</span><del>- new media.controller.GalleryAdd(),
</del><ins>+ new media.controller.CollectionAdd({
+ tag: 'gallery',
+ type: 'image',
+ title: l10n.addToGalleryTitle
+ }),
</ins><span class="cx">
</span><span class="cx"> new media.controller.Library({
</span><span class="cx"> id: 'playlist',
</span><span class="lines">@@ -1833,7 +1809,11 @@
</span><span class="cx"> menu: 'playlist'
</span><span class="cx"> }),
</span><span class="cx">
</span><del>- new media.controller.PlaylistAdd(),
</del><ins>+ new media.controller.CollectionAdd({
+ tag: 'playlist',
+ type: 'audio',
+ title: l10n.addToPlaylistTitle
+ }),
</ins><span class="cx">
</span><span class="cx"> new media.controller.Library({
</span><span class="cx"> id: 'video-playlist',
</span><span class="lines">@@ -1856,7 +1836,11 @@
</span><span class="cx"> menu: 'video-playlist'
</span><span class="cx"> }),
</span><span class="cx">
</span><del>- new media.controller.VideoPlaylistAdd()
</del><ins>+ new media.controller.CollectionAdd({
+ tag: 'video-playlist',
+ type: 'video',
+ title: l10n.addToVideoPlaylistTitle
+ })
</ins><span class="cx"> ]);
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>