Changeset 42848 for branches/4.9

Timestamp:

03/18/2018 04:19:50 PM (7 years ago)

Author:

ocean90

Message:

Media: Grid view - correct placeholder positioning during uploads.

Preventing contextually created attachments from being added to the grid collection in Attachments.validator. Remove the previous filtering introduced in [41937] which caused the placement issue.

Merge of [42739-42740] to the 4.9 branch.

Props lancewillett, Junaidkbr, designsimply, joemcgill.
Fixes #42968.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-includes/js/media-models.js (modified) (1 diff)
• src/wp-includes/js/media-views.js (modified) (2 diffs)
• src/wp-includes/js/media/controllers/library.js (modified) (2 diffs)
• src/wp-includes/js/media/models/attachments.js (modified) (1 diff)

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

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

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

@@ -954 +954 @@
         }
 
-        this._filterContext();
-        this.get('library').on( 'add', this._filterContext, this );
-
         this.resetDisplays();
     },
@@ -1156 +1153 @@
             setUserSetting( 'libraryContent', mode );
         }
-    },
-
-    /**
-     * 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') === '';
-        } ) );
     }
+
 });
 

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

@@ -86 +86 @@
         }
 
-        this._filterContext();
-        this.get('library').on( 'add', this._filterContext, this );
-
         this.resetDisplays();
     },
@@ -288 +285 @@
             setUserSetting( 'libraryContent', mode );
         }
-    },
-
-    /**
-     * 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') === '';
-        } ) );
     }
+
 });
 

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

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