Changeset 51187

Timestamp:

06/20/2021 11:25:55 PM (3 years ago)

Author:

joedolson

Message:

Media: Adapt response shape depending on type of query.

Restore inheriting the backbone fetch in the media library and adapt the AJAX response according to the action performed in the media query.

In [51145], the response shape was restored to the original shape, and a custom fetch was added to handle assigning the totalAttachments information in the collection. The custom fetch triggered a new set of bugs relating to zero-sized collections and loading individual images.

props adamsilverstein, ryelle, peterwilsoncc, Presskopp, desrosj.
Fixes #53421, #53419.

Location:

trunk/src/js

Files:

• _enqueues/wp/util.js (modified) (1 diff)
• media/models/attachments.js (modified) (1 diff)

trunk/src/js/_enqueues/wp/util.js

@@ -116 +116 @@
 
                     if ( _.isObject( response ) && ! _.isUndefined( response.success ) ) {
-                        deferred[ response.success ? 'resolveWith' : 'rejectWith' ]( deferred.jqXHR, [response.data] );
+
+                        // When handling a media attachments request, get the total attachments from response headers.
+                        var context = this;
+                        deferred.done( function() {
+                            if (
+                                'query-attachments' === action.data.action &&
+                                deferred.jqXHR.hasOwnProperty( 'getResponseHeader' ) &&
+                                deferred.jqXHR.getResponseHeader( 'X-WP-Total' )
+                            ) {
+                                context.totalAttachments = parseInt( deferred.jqXHR.getResponseHeader( 'X-WP-Total' ), 10 );
+                            } else {
+                                context.totalAttachments = 0;
+                            }
+                        } );
+                        deferred[ response.success ? 'resolveWith' : 'rejectWith' ]( this, [response.data] );
                     } else {
                         deferred.rejectWith( this, [response] );

trunk/src/js/media/models/attachments.js

@@ -405 +405 @@
     },
 
-    // Customize fetch so we can extract the total post count from the response headers.
-    fetch: function(options) {
-        var collection = this;
-        var fetched = Backbone.Collection.prototype.fetch.call(this, options)
-            .done( function() {
-                if ( this.hasOwnProperty( 'getResponseHeader' ) ) {
-                    collection.totalAttachments = parseInt( this.getResponseHeader( 'X-WP-Total' ), 10 );
-                } else {
-                    collection.totalAttachments = 0;
-                }
-            } );
-        return fetched;
-    },
-
     /**
      * If the collection is a query, create and mirror an Attachments Query collection.