<!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>[23057] trunk/wp-includes/js/media-models.js: Media models: Trac and ignore deleted attachments.</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/23057">23057</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-12-05 02:31:41 +0000 (Wed, 05 Dec 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media models: Trac and ignore deleted attachments.
Treat an admin-ajax response of 1 as successful for backwards compatibility with existing handlers.
props koopersmith. fixes <a href="http://core.trac.wordpress.org/ticket/22750">#22750</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 (23056 => 23057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-models.js 2012-12-05 01:38:44 UTC (rev 23056)
+++ trunk/wp-includes/js/media-models.js 2012-12-05 02:31:41 UTC (rev 23057)
</span><span class="lines">@@ -142,6 +142,11 @@
</span><span class="cx">
</span><span class="cx"> // Use with PHP's wp_send_json_success() and wp_send_json_error()
</span><span class="cx"> $.ajax( options ).done( function( response ) {
</span><ins>+ // Treat a response of `1` as successful for backwards
+ // compatibility with existing handlers.
+ if ( response === '1' || response === 1 )
+ response = { success: true };
+
</ins><span class="cx"> if ( _.isObject( response ) && ! _.isUndefined( response.success ) )
</span><span class="cx"> deferred[ response.success ? 'resolveWith' : 'rejectWith' ]( this, [response.data] );
</span><span class="cx"> else
</span><span class="lines">@@ -264,13 +269,22 @@
</span><span class="cx"> // This will permanently delete an attachment.
</span><span class="cx"> } else if ( 'delete' === method ) {
</span><span class="cx"> options = options || {};
</span><ins>+
+ if ( ! options.wait )
+ this.destroyed = true;
+
</ins><span class="cx"> options.context = this;
</span><span class="cx"> options.data = _.extend( options.data || {}, {
</span><span class="cx"> action: 'delete-post',
</span><span class="cx"> id: this.id,
</span><span class="cx"> _wpnonce: this.get('nonces')['delete']
</span><span class="cx"> });
</span><del>- return media.ajax( options );
</del><ins>+
+ return media.ajax( options ).done( function() {
+ this.destroyed = true;
+ }).fail( function() {
+ this.destroyed = false;
+ });
</ins><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -401,7 +415,11 @@
</span><span class="cx"> this.reset( this._source.filter( this.validator, this ) );
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ validateDestroyed: false,
+
</ins><span class="cx"> validator: function( attachment ) {
</span><ins>+ if ( ! this.validateDestroyed && attachment.destroyed )
+ return false;
</ins><span class="cx"> return _.all( this.filters, function( filter, key ) {
</span><span class="cx"> return !! filter.call( this, attachment );
</span><span class="cx"> }, this );
</span></span></pre>
</div>
</div>
</body>
</html>