Changeset 52384

Timestamp:

12/17/2021 08:15:01 PM (5 years ago)

Author:

antpb

Message:

Media: Fix selections in Media Library Featured Image modal on open.

In [50829] infinite scrolling was removed from the Media Library and modal which introduced unintended behavior for featured images where only the selected image shows when opening the library. This change reverts only the logic that caused this and applies a proper fix when opening the library.

Props benitolopez, hellofromTonya, joedolson, peterwilsoncc, circlecube, danielbachhuber, PieWP, sabernhardt, szaqal21, dariak, sergeybiryukov.
Fixes #53765.

Location:

trunk/src/js/media/controllers

Files:

• featured-image.js (modified) (2 diffs)
• replace-image.js (modified) (2 diffs)

trunk/src/js/media/controllers/featured-image.js

@@ -107 +107 @@
         updateSelection: function() {
                 var selection = this.get('selection'),
-                        library = this.get('library'),
                         id = wp.media.view.settings.post.featuredImageId,
-                        infiniteScrolling = wp.media.view.settings.infiniteScrolling,
                         attachment;
 
@@ -118 +116 @@
 
                 selection.reset( attachment ? [ attachment ] : [] );
-
-                if ( ! infiniteScrolling && library.hasMore() ) {
-                        library.more();
-                }
         }
 });

trunk/src/js/media/controllers/replace-image.js

@@ -91 +91 @@
          */
         activate: function() {
-                this.updateSelection();
+                this.frame.on( 'content:render:browse', this.updateSelection, this );
+
                 Library.prototype.activate.apply( this, arguments );
+        },
+
+        /**
+         * @since 5.9.0
+         */
+        deactivate: function() {
+                this.frame.off( 'content:render:browse', this.updateSelection, this );
+
+                Library.prototype.deactivate.apply( this, arguments );
         },
 
@@ -100 +110 @@
         updateSelection: function() {
                 var selection = this.get('selection'),
-                        library = this.get('library'),
-                        attachment = this.image.attachment,
-                        infiniteScrolling = wp.media.view.settings.infiniteScrolling;
+                        attachment = this.image.attachment;
 
                 selection.reset( attachment ? [ attachment ] : [] );
-
-                if ( ! infiniteScrolling && library.getTotalAttachments() === 0 && library.hasMore() ) {
-                        library.more();
-                }
         }
 });