<!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>[23068] trunk/wp-includes/js/media-views.js: Fix the "Uploaded to this post" filter in the "Add to gallery" state.</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, #logmsg > ol { margin-left: 0; 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/23068">23068</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2012-12-05 09:25:17 +0000 (Wed, 05 Dec 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix the "Uploaded to this post" filter in the "Add to gallery" state. fixes <a href="http://core.trac.wordpress.org/ticket/22723">#22723</a>
Also, use "images" wording instead of generic "media items" when in a gallery (images-only) context. fixes <a href="http://core.trac.wordpress.org/ticket/22722">#22722</a>
Both are props koopersmith</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjsmediaviewsjs">trunk/wp-includes/js/media-views.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (23067 => 23068)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-12-05 09:04:19 UTC (rev 23067)
+++ trunk/wp-includes/js/media-views.js 2012-12-05 09:25:17 UTC (rev 23068)
</span><span class="lines">@@ -389,15 +389,9 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> activate: function() {
</span><del>- if ( this.get('syncLastSelection') ) {
</del><ins>+ if ( this.get('syncLastSelection') )
</ins><span class="cx"> this.getLastSelection();
</span><del>- }
</del><span class="cx">
</span><del>- this._excludeStateLibrary();
- this.buildComposite();
- this.on( 'change:library change:exclude', this.buildComposite, this );
- this.on( 'change:excludeState', this._excludeState, this );
-
</del><span class="cx"> wp.Uploader.queue.on( 'add', this.uploading, this );
</span><span class="cx">
</span><span class="cx"> this.get('selection').on( 'add remove reset', this.refreshContent, this );
</span><span class="lines">@@ -418,11 +412,6 @@
</span><span class="cx"> this.get('selection').off( null, null, this );
</span><span class="cx">
</span><span class="cx"> wp.Uploader.queue.off( null, null, this );
</span><del>-
- this.off( 'change:excludeState', this._excludeState, this );
- this.off( 'change:library change:exclude', this.buildComposite, this );
-
- this.destroyComposite();
</del><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> reset: function() {
</span><span class="lines">@@ -519,67 +508,6 @@
</span><span class="cx">
</span><span class="cx"> if ( view && view.get( mode ) )
</span><span class="cx"> setUserSetting( 'libraryContent', mode );
</span><del>- },
-
- buildComposite: function() {
- var original = this.get('_library'),
- exclude = this.get('exclude'),
- composite;
-
- this.destroyComposite();
- if ( ! this.get('exclude') )
- return;
-
- // Remember the state's original library.
- if ( ! original )
- this.set( '_library', original = this.get('library') );
-
- // Create a composite library in its place.
- composite = new media.model.Attachments( null, {
- props: _.pick( original.props.toJSON(), 'order', 'orderby' )
- });
-
- // Accepts attachments that exist in the original library and
- // that do not exist in the excluded library.
- composite.validator = function( attachment ) {
- return !! original.getByCid( attachment.cid ) && ! exclude.getByCid( attachment.cid );
- };
-
- composite.mirror( original ).observe( exclude );
-
- this.set( 'library', composite );
- },
-
- destroyComposite: function() {
- var composite = this.get('library'),
- original = this.get('_library');
-
- if ( ! original )
- return;
-
- composite.unobserve();
- this.set( 'library', original );
- this.unset('_library');
- },
-
- _excludeState: function() {
- var current = this.get('excludeState'),
- previous = this.previous('excludeState');
-
- if ( previous )
- this.frame.state( previous ).off( 'change:library', this._excludeStateLibrary, this );
-
- if ( current )
- this.frame.state( current ).on( 'change:library', this._excludeStateLibrary, this );
- },
-
- _excludeStateLibrary: function() {
- var current = this.get('excludeState');
-
- if ( ! current )
- return;
-
- this.set( 'exclude', this.frame.state( current ).get('library') );
</del><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -662,6 +590,47 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ // wp.media.controller.GalleryAdd
+ // ---------------------------------
+ media.controller.GalleryAdd = media.controller.Library.extend({
+ defaults: _.defaults({
+ id: 'gallery-library',
+ filterable: 'uploaded',
+ multiple: 'add',
+ menu: 'gallery',
+ toolbar: 'gallery-add',
+ title: l10n.addToGalleryTitle,
+ priority: 100
+ }, media.controller.Library.prototype.defaults ),
+
+ initialize: function() {
+ // If we haven't been provided a `library`, create a `Selection`.
+ if ( ! this.get('library') )
+ this.set( 'library', media.query({ type: 'image' }) );
+
+ media.controller.Library.prototype.initialize.apply( this, arguments );
+ },
+
+ activate: function() {
+ var library = this.get('library'),
+ edit = this.frame.state('gallery-edit').get('library');
+
+ if ( this.editLibrary && this.editLibrary !== edit )
+ library.unobserve( this.editLibrary );
+
+ // Accepts attachments that exist in the original library and
+ // that do not exist in gallery's library.
+ library.validator = function( attachment ) {
+ return !! this.mirroring.getByCid( attachment.cid ) && ! edit.getByCid( attachment.cid ) && media.model.Selection.prototype.validator.apply( this, arguments );
+ };
+
+ library.observe( edit );
+ this.editLibrary = edit;
+
+ media.controller.Library.prototype.activate.apply( this, arguments );
+ }
+ });
+
</ins><span class="cx"> // wp.media.controller.FeaturedImage
</span><span class="cx"> // ---------------------------------
</span><span class="cx"> media.controller.FeaturedImage = media.controller.Library.extend({
</span><span class="lines">@@ -1594,17 +1563,7 @@
</span><span class="cx"> menu: 'gallery'
</span><span class="cx"> }),
</span><span class="cx">
</span><del>- new media.controller.Library({
- id: 'gallery-library',
- library: media.query({ type: 'image' }),
- filterable: 'uploaded',
- multiple: 'add',
- menu: 'gallery',
- toolbar: 'gallery-add',
- excludeState: 'gallery-edit',
- title: l10n.addToGalleryTitle,
- priority: 100
- })
</del><ins>+ new media.controller.GalleryAdd()
</ins><span class="cx"> ]);
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1836,6 +1795,7 @@
</span><span class="cx"> style: 'primary',
</span><span class="cx"> text: l10n.addToGallery,
</span><span class="cx"> priority: 80,
</span><ins>+ requires: { selection: true },
</ins><span class="cx">
</span><span class="cx"> click: function() {
</span><span class="cx"> var controller = this.controller,
</span></span></pre>
</div>
</div>
</body>
</html>