Ticket #42968: 42968.2.diff

src/wp-includes/js/media-models.js

@@ -642 +642 @@
          * @returns {Boolean}
          */
         validator: function( attachment ) {
+
+                // Filter out contextually created attachments (e.g. headers, logos, etc.).
+                if ( '' !== attachment.attributes.context ) {
+                        return false;
+                }
+
                 if ( ! this.validateDestroyed && attachment.destroyed ) {
                         return false;
                 }

src/wp-includes/js/media-views.js

@@ -953 +953 @@
                         }) );
                 }
 
-                this._filterContext();
-                this.get('library').on( 'add', this._filterContext, this );
-
                 this.resetDisplays();
         },
 
@@ -1157 +1154 @@
                 }
         },
 
-        /**
-         * Filter out contextually created attachments (e.g. headers, logos, etc.)
-         *
-         * @since 4.9.0
-         */
-        _filterContext: function() {
-                var library = this.get('library');
-
-                library.set( library.filter( function( item ) {
-                        return item.get('context') === '';
-                } ) );
-        }
 });
 
 // Make selectionSync available on any Media Library state.

src/wp-includes/js/media/controllers/library.js

@@ -85 +85 @@
                         }) );
                 }
 
-                this._filterContext();
-                this.get('library').on( 'add', this._filterContext, this );
-
                 this.resetDisplays();
         },
 
@@ -289 +286 @@
                 }
         },
 
-        /**
-         * Filter out contextually created attachments (e.g. headers, logos, etc.)
-         *
-         * @since 4.9.0
-         */
-        _filterContext: function() {
-                var library = this.get('library');
-
-                library.set( library.filter( function( item ) {
-                        return item.get('context') === '';
-                } ) );
-        }
 });
 
 // Make selectionSync available on any Media Library state.

src/wp-includes/js/media/models/attachments.js

@@ -151 +151 @@
          * @returns {Boolean}
          */
         validator: function( attachment ) {
+
+                // Filter out contextually created attachments (e.g. headers, logos, etc.).
+                if ( '' !== attachment.attributes.context ) {
+                        return false;
+                }
+
                 if ( ! this.validateDestroyed && attachment.destroyed ) {
                         return false;
                 }