<!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>[22655] trunk/wp-includes/js: Media: Optimize media 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/22655">22655</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-11-19 02:43:10 +0000 (Mon, 19 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: Optimize media models.
* Merge `Composite` model with general `Attachments` model, as `Attachments.validate` and `Composite.evaluate` were functionally equivalent.
* Queries should only watch `wp.Uploader.queue`, as watching `Attachments.all` results in queries attempting to add attachments before their properties are set (which then results a few too many irrelevant adds/removes). `Attachments.all` should potentially be removed or rethought.
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 (22654 => 22655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-models.js 2012-11-19 02:00:01 UTC (rev 22654)
+++ trunk/wp-includes/js/media-models.js 2012-11-19 02:43:10 UTC (rev 22655)
</span><span class="lines">@@ -358,22 +358,64 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> validate: function( attachment, options ) {
</span><ins>+ var valid = this.validator( attachment ),
+ hasAttachment = !! this.getByCid( attachment.cid );
+
</ins><span class="cx"> // Only retain the `silent` option.
</span><span class="cx"> options = {
</span><span class="cx"> silent: options && options.silent
</span><span class="cx"> };
</span><span class="cx">
</span><del>- return this[ this.validator( attachment ) ? 'add' : 'remove' ]( attachment, options );
</del><ins>+ if ( ! valid && hasAttachment )
+ this.remove( attachment, options );
+ else if ( valid && ! hasAttachment )
+ this.add( attachment, options );
+
+ return this;
</ins><span class="cx"> },
</span><span class="cx">
</span><ins>+ validateAll: function( attachments ) {
+ _.each( attachments.models, function( attachment ) {
+ this.validate( attachment, { silent: true });
+ }, this );
+
+ return this;
+ },
+
</ins><span class="cx"> observe: function( attachments ) {
</span><del>- attachments.on( 'add change', this.validate, this );
</del><ins>+ this.observers = this.observers || [];
+ this.observers.push( attachments );
+
+ attachments.on( 'add change remove', this._validateHandler, this );
+ attachments.on( 'reset', this._validateAllHandler, this );
+
+ this.validateAll( attachments );
+ return this;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> unobserve: function( attachments ) {
</span><del>- attachments.off( 'add change', this.validate, 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><ins>+ _validateHandler: function( attachment, attachments, options ) {
+ return this.validate( attachment, options );
+ },
+
+ _validateAllHandler: function( attachments, options ) {
+ return this.evaluateAll( attachments, options );
+ },
+
</ins><span class="cx"> mirror: function( attachments ) {
</span><span class="cx"> if ( this.mirroring && this.mirroring === attachments )
</span><span class="cx"> return;
</span><span class="lines">@@ -518,15 +560,15 @@
</span><span class="cx"> return false;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- // Observe the central `Attachments.all` model to watch for new
- // matches for the query.
</del><ins>+ // Observe the central `wp.Uploader.queue` collection to watch for
+ // new matches for the query.
</ins><span class="cx"> //
</span><span class="cx"> // Only observe when a limited number of query args are set. There
</span><span class="cx"> // are no filters for other properties, so observing will result in
</span><span class="cx"> // false positives in those queries.
</span><span class="cx"> allowed = [ 's', 'order', 'orderby', 'posts_per_page', 'post_mime_type' ];
</span><del>- if ( _( this.args ).chain().keys().difference( allowed ).isEmpty().value() )
- this.observe( Attachments.all );
</del><ins>+ if ( wp.Uploader && _( this.args ).chain().keys().difference( allowed ).isEmpty().value() )
+ this.observe( wp.Uploader.queue );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> more: function( options ) {
</span><span class="lines">@@ -732,83 +774,4 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><del>- /**
- * wp.media.model.Composite
- *
- * Creates a model that can simultaneously pull from two or more collections.
- */
- media.model.Composite = Attachments.extend({
- initialize: function( models, options ) {
- this.observe( this, { silent: true });
- Attachments.prototype.initialize.apply( this, arguments );
- },
-
- evaluate: function( attachment, options ) {
- var valid = this.validator( attachment ),
- hasAttachment = !! this.getByCid( attachment.cid );
-
- if ( ! valid && hasAttachment )
- this.remove( attachment, options );
- else if ( valid && ! hasAttachment )
- this.add( attachment, options );
-
- return this;
- },
-
- validator: function() {
- return true;
- },
-
- evaluateAll: function( attachments, options ) {
- _.each( attachments.models, function( attachment ) {
- this.evaluate( attachment, { silent: true });
- }, this );
-
- return this;
- },
-
- observe: function( attachments, options ) {
- var silent = options && options.silent;
- this.observers = this.observers || [];
- this.observers.push( attachments );
-
- attachments.on( 'add remove', silent ? this._evaluateSilentHandler : this._evaluateHandler, this );
- attachments.on( 'reset', silent ? this._evaluateAllSilentHandler : this._evaluateAllHandler, this );
-
- this.evaluateAll( attachments, options );
- return this;
- },
-
- unobserve: function( attachments ) {
- 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;
- },
-
- _evaluateHandler: function( attachment, attachments, options ) {
- return this.evaluate( attachment, options );
- },
-
- _evaluateAllHandler: function( attachments, options ) {
- return this.evaluateAll( attachments, options );
- },
-
- _evaluateSilentHandler: function( attachment, attachments, options ) {
- return this.evaluate( attachment, _.defaults({ silent: true }, options ) );
- },
-
- _evaluateAllSilentHandler: function( attachments, options ) {
- return this.evaluateAll( attachments, _.defaults({ silent: true }, options ) );
- }
- });
-
</del><span class="cx"> }(jQuery));
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (22654 => 22655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-11-19 02:00:01 UTC (rev 22654)
+++ trunk/wp-includes/js/media-views.js 2012-11-19 02:43:10 UTC (rev 22655)
</span><span class="lines">@@ -387,7 +387,7 @@
</span><span class="cx"> this.set( '_library', original = this.get('library') );
</span><span class="cx">
</span><span class="cx"> // Create a composite library in its place.
</span><del>- composite = new media.model.Composite( null, {
</del><ins>+ composite = new media.model.Attachments( null, {
</ins><span class="cx"> props: _.pick( original.props.toJSON(), 'order', 'orderby' )
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -2410,6 +2410,7 @@
</span><span class="cx">
</span><span class="cx"> _.each(['add','remove'], function( method ) {
</span><span class="cx"> this.collection.on( method, function( attachment, attachments, options ) {
</span><ins>+ console.log( method, 'attachment', attachment.id, 'at', options.index );
</ins><span class="cx"> this[ method ]( attachment, options.index );
</span><span class="cx"> }, this );
</span><span class="cx"> }, this );
</span></span></pre>
</div>
</div>
</body>
</html>