<!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>[24771] trunk/wp-includes/js/media-models.js: Fix a media regression in [24110] that could cause duplicate 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 { 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/24771">24771</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2013-07-22 22:24:33 +0000 (Mon, 22 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix a media regression in <a href="http://core.trac.wordpress.org/changeset/24110">[24110]</a> that could cause duplicate models.
Props garyc40. Fixes <a href="http://core.trac.wordpress.org/ticket/24753">#24753</a>. See <a href="http://core.trac.wordpress.org/ticket/24094">#24094</a>, <a href="http://core.trac.wordpress.org/ticket/23830">#23830</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjsmediamodelsjs">trunk/wp-includes/js/media-models.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 (24770 => 24771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-models.js 2013-07-22 22:04:38 UTC (rev 24770)
+++ trunk/wp-includes/js/media-models.js 2013-07-22 22:24:33 UTC (rev 24771)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> window.wp = window.wp || {};
</span><span class="cx">
</span><span class="cx"> (function($){
</span><del>- var Attachment, Attachments, Query, compare, l10n, media, bindSyncEvents;
</del><ins>+ var Attachment, Attachments, Query, compare, l10n, media;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * wp.media( attributes )
</span><span class="lines">@@ -67,27 +67,6 @@
</span><span class="cx"> return a > b ? -1 : 1;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- // Ensures the 'sync' and 'error' events are always
- // correctly triggered when overloading `Backbone.sync`.
- bindSyncEvents = function( model, options ) {
- var success = options.success,
- error = options.error;
-
- options.success = function( resp ) {
- if ( success )
- success( resp );
- model.trigger( 'sync', model, resp, options );
- };
-
- options.error = function( xhr ) {
- if ( error )
- error( xhr );
- model.trigger( 'error', model, xhr, options );
- };
-
- return options;
- };
-
</del><span class="cx"> _.extend( media, {
</span><span class="cx"> /**
</span><span class="cx"> * media.template( id )
</span><span class="lines">@@ -197,7 +176,6 @@
</span><span class="cx"> action: 'get-attachment',
</span><span class="cx"> id: this.id
</span><span class="cx"> });
</span><del>- bindSyncEvents( model, options );
</del><span class="cx"> return media.ajax( options );
</span><span class="cx">
</span><span class="cx"> // Overload the `update` request so properties can be saved.
</span><span class="lines">@@ -226,7 +204,6 @@
</span><span class="cx"> }, this );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bindSyncEvents( model, options );
</del><span class="cx"> return media.ajax( options );
</span><span class="cx">
</span><span class="cx"> // Overload the `delete` request so attachments can be removed.
</span><span class="lines">@@ -244,7 +221,6 @@
</span><span class="cx"> _wpnonce: this.get('nonces')['delete']
</span><span class="cx"> });
</span><span class="cx">
</span><del>- bindSyncEvents( model, options );
</del><span class="cx"> return media.ajax( options ).done( function() {
</span><span class="cx"> this.destroyed = true;
</span><span class="cx"> }).fail( function() {
</span><span class="lines">@@ -506,6 +482,27 @@
</span><span class="cx"> return this.mirroring ? this.mirroring.hasMore() : false;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ parse: function( resp, xhr ) {
+ if ( ! _.isArray( resp ) )
+ resp = [resp];
+
+ return _.map( resp, function( attrs ) {
+ var id, attachment;
+ if ( attrs instanceof Backbone.Model ) {
+ id = attrs.get( 'id' );
+ attrs = attrs.attributes;
+ } else {
+ id = attrs.id;
+ }
+
+ attachment = Attachment.get( attrs.id );
+ if ( ! _.isEqual( attachment.attributes, attrs ) )
+ attachment.set( attachment.parse( attrs, xhr ) );
+
+ return attachment;
+ });
+ },
+
</ins><span class="cx"> _requery: function() {
</span><span class="cx"> if ( this.props.get('query') )
</span><span class="cx"> this.mirror( Query.get( this.props.toJSON() ) );
</span><span class="lines">@@ -701,7 +698,6 @@
</span><span class="cx"> args.paged = Math.floor( this.length / args.posts_per_page ) + 1;
</span><span class="cx">
</span><span class="cx"> options.data.query = args;
</span><del>- bindSyncEvents( model, options );
</del><span class="cx"> return media.ajax( options );
</span><span class="cx">
</span><span class="cx"> // Otherwise, fall back to Backbone.sync()
</span></span></pre>
</div>
</div>
</body>
</html>