Changeset 41937

Timestamp:

10/19/2017 04:17:31 AM (9 years ago)

Author:

joemcgill

Message:

Customizer: Improve handling of crops in the media library.

This is a follow up on r41732, implementing the following improvements:

• Attachment parent info is now stored in attachment meta rather than a

separate post meta key.

• Attachments created from contextual crops (e.g. header, logos, etc.) are

filtered out of the media library using a new _filterContext method in
wp.media.controller.Library.

Props joemcgill, westonruter.
See #21819.

Location:

trunk/src

Files:

• wp-admin/custom-header.php (modified) (2 diffs)
• wp-includes/js/media-views.js (modified) (2 diffs)
• wp-includes/js/media/controllers/library.js (modified) (2 diffs)
• wp-includes/media.php (modified) (1 diff)
• wp-includes/theme.php (modified) (1 diff)

trunk/src/wp-admin/custom-header.php

@@ -1188 +1188 @@
                 $metadata = wp_generate_attachment_metadata( $attachment_id, $cropped );
 
+                // If this is a crop, save the original attachment ID as metadata.
+                if ( $parent_id ) {
+                        $metadata['attachment_parent'] = $parent_id;
+                }
+
                 /**
                  * Filters the header image attachment metadata.
@@ -1198 +1203 @@
                  */
                 $metadata = apply_filters( 'wp_header_image_attachment_metadata', $metadata );
+
                 wp_update_attachment_metadata( $attachment_id, $metadata );
-
-                if ( $parent_id ) {
-                        $meta = add_post_meta( $attachment_id, '_wp_attachment_parent', $parent_id, true );
-                }
 
                 return $attachment_id;

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

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

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

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

trunk/src/wp-includes/media.php

@@ -3160 +3160 @@
         }
 
+        $context = get_post_meta( $attachment->ID, '_wp_attachment_context', true );
+        $response['context'] = ( $context ) ? $context : '';
+
         if ( current_user_can( 'edit_post', $attachment->ID ) ) {
                 $response['nonces']['update'] = wp_create_nonce( 'update-post_' . $attachment->ID );

trunk/src/wp-includes/theme.php

@@ -1215 +1215 @@
                 $header_images[$header_index]['thumbnail_url'] = $url;
                 $header_images[$header_index]['alt_text'] = get_post_meta( $header->ID, '_wp_attachment_image_alt', true );
-                $header_images[$header_index]['attachment_parent'] = (int) get_post_meta( $header->ID, '_wp_attachment_parent', true );
+                $header_images[$header_index]['attachment_parent'] = isset( $header_data['attachment_parent'] ) ? $header_data['attachment_parent'] : '';
 
                 if ( isset( $header_data['width'] ) )