<!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>[22477] trunk/wp-includes/js: Media JS: Add JIT composite library creation/destruction to states to allow for dynamically excluded Attachment models.</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/22477">22477</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-11-09 01:23:20 +0000 (Fri, 09 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media JS: Add JIT composite library creation/destruction to states to allow for dynamically excluded Attachment models. see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjsmediamodelsjs">trunk/wp-includes/js/media-models.js</a></li>
<li><a href="#trunkwpincludesjsmediaviewsjs">trunk/wp-includes/js/media-views.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjsmediamodelsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-models.js (22476 => 22477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-models.js 2012-11-09 00:16:30 UTC (rev 22476)
+++ trunk/wp-includes/js/media-models.js 2012-11-09 01:23:20 UTC (rev 22477)
</span><span class="lines">@@ -741,16 +741,29 @@
</span><span class="cx">
</span><span class="cx"> observe: function( attachments, options ) {
</span><span class="cx"> var silent = options && options.silent;
</span><ins>+ this.observers = this.observers || [];
+ this.observers.push( attachments );
</ins><span class="cx">
</span><span class="cx"> attachments.on( 'add remove', silent ? this._evaluateSilentHandler : this._evaluateHandler, this );
</span><span class="cx"> attachments.on( 'reset', silent ? this._evaluateAllSilentHandler : this._evaluateAllHandler, this );
</span><span class="cx">
</span><span class="cx"> this.evaluateAll( attachments, options );
</span><ins>+ return this;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> unobserve: function( attachments ) {
</span><del>- attachments.off( 'add remove', this._evaluateHandler, this );
- attachments.off( 'reset', this._evaluateAllHandler, this );
</del><ins>+ if ( attachments ) {
+ attachments.off( null, null, this );
+ this.observers = _.without( this.observers, attachments );
+
+ } else {
+ _.each( this.observers, function( attachments ) {
+ attachments.off( null, null, this );
+ }, this );
+ delete this.observers;
+ }
+
+ return this;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _evaluateHandler: function( attachment, attachments, options ) {
</span></span></pre></div>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (22476 => 22477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-11-09 00:16:30 UTC (rev 22476)
+++ trunk/wp-includes/js/media-views.js 2012-11-09 01:23:20 UTC (rev 22477)
</span><span class="lines">@@ -291,6 +291,11 @@
</span><span class="cx"> activate: function() {
</span><span class="cx"> var selection = this.get('selection');
</span><span class="cx">
</span><ins>+ this._excludeStateLibrary();
+ this.buildComposite();
+ this.on( 'change:library change:exclude', this.buildComposite, this );
+ this.on( 'change:excludeState', this._excludeState, this );
+
</ins><span class="cx"> // If we're in a workflow that supports multiple attachments,
</span><span class="cx"> // automatically select any uploading attachments.
</span><span class="cx"> if ( this.get('multiple') )
</span><span class="lines">@@ -306,6 +311,10 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> deactivate: function() {
</span><ins>+ this.off( 'change:library change:exclude', this.buildComposite, this );
+ this.off( 'change:excludeState', this._excludeState, this );
+ this.destroyComposite();
+
</ins><span class="cx"> wp.Uploader.queue.off( 'add', this.selectUpload, this );
</span><span class="cx">
</span><span class="cx"> // Unbind all event handlers that use this state as the context
</span><span class="lines">@@ -375,6 +384,72 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return this;
</span><ins>+ },
+
+ 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.Composite( 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.observe( original ).observe( exclude );
+
+ // When `more()` is triggered on the composite collection,
+ // pass the command over to the `original`, which will
+ // populate the query.
+ composite.more = _.bind( original.more, original );
+
+ 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.get( previous ).off( 'change:library', this._excludeStateLibrary, this );
+
+ if ( current )
+ this.frame.get( previous ).on( 'change:library', this._excludeStateLibrary, this );
+ },
+
+ _excludeStateLibrary: function() {
+ var current = this.get('excludeState');
+
+ if ( ! current )
+ return;
+
+ this.set( 'exclude', this.frame.get( current ).get('library') );
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -659,57 +734,20 @@
</span><span class="cx">
</span><span class="cx"> new media.controller.Library( _.defaults({
</span><span class="cx"> id: 'gallery-library',
</span><del>- library: media.query({ type: 'image' })
</del><ins>+ library: media.query({ type: 'image' }),
+ excludeState: 'gallery-edit'
</ins><span class="cx"> }, gallery ) ),
</span><span class="cx">
</span><span class="cx"> new media.controller.Upload( _.defaults({
</span><del>- id: 'gallery-upload'
</del><ins>+ id: 'gallery-upload',
+ excludeState: 'gallery-edit'
</ins><span class="cx"> }, gallery ) )
</span><span class="cx"> ]);
</span><span class="cx">
</span><del>- this.get('gallery-edit').on( 'change:library', this.updateGalleryLibraries, this ).set({
- library: options.selection
- });
-
</del><span class="cx"> // Set the default state.
</span><span class="cx"> this.state( options.state );
</span><span class="cx"> },
</span><span class="cx">
</span><del>- updateGalleryLibraries: function() {
- var editLibrary = this.get('gallery-edit').get('library');
-
- _.each(['gallery-library','gallery-upload'], function( id ) {
- var state = this.get( id ),
- original = state.get('_library'),
- composite;
-
- // Remember the state's original library.
- if ( ! original )
- state.set( '_library', original = state.get('library') );
-
- // Create a composite library in its place.
- composite = new media.model.Composite( null, {
- props: _.pick( original.props.toJSON(), 'order', 'orderby' )
- });
-
- // Accepts attachments that exist in the original library and
- // that do not exist in the state's library.
- composite.validator = function( attachment ) {
- return !! original.getByCid( attachment.cid ) && ! editLibrary.getByCid( attachment.cid );
- };
-
- composite.observe( original );
- composite.observe( editLibrary );
-
- // When `more()` is triggered on the composite collection,
- // pass the command over to the `original`, which will
- // populate the query.
- composite.more = _.bind( original.more, original );
-
- state.set( 'library', composite );
- }, this );
- },
-
</del><span class="cx"> // Menus
</span><span class="cx"> mainMenu: function() {
</span><span class="cx"> this.menu.view( new media.view.Menu({
</span></span></pre>
</div>
</div>
</body>
</html>