Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-25 06:14:58 +02:00
Code Issues Projects Releases Wiki Activity

Customizer: Improve handling of crops in the media library.

Browse Source 
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.

Built from https://develop.svn.wordpress.org/trunk@41937


git-svn-id: http://core.svn.wordpress.org/trunk@41771 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Joe McGill 2017-10-19 04:18:47 +00:00
parent 20aad6b5c5
commit d21f6799a6
6 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-admin/custom-header.php
View File

@ -1187,6 +1187,11 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
$attachment_id = wp_insert_attachment( $object, $cropped );
$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.
*
@ -1197,11 +1202,8 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
* @param array $metadata Attachment metadata.
*/
$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 );
}
wp_update_attachment_metadata( $attachment_id, $metadata );
return $attachment_id;
}

16
wp-includes/js/media-views.js
View File

@ -953,6 +953,9 @@ Library = wp.media.controller.State.extend(/** @lends wp.media.controller.Librar
}) );
}
this._filterContext();
this.get('library').on( 'add', this._filterContext, this );
this.resetDisplays();
},
@ -1152,6 +1155,19 @@ Library = wp.media.controller.State.extend(/** @lends wp.media.controller.Librar
if ( view && view.get( mode ) ) {
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') === '';
} ) );
}
});

8
wp-includes/js/media-views.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
wp-includes/media.php
View File

@ -3159,6 +3159,9 @@ function wp_prepare_attachment_for_js( $attachment ) {
$response['filesizeHumanReadable'] = size_format( $bytes );
}
$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 );
$response['nonces']['edit'] = wp_create_nonce( 'image_editor-' . $attachment->ID );

2
wp-includes/theme.php
View File

@ -1214,7 +1214,7 @@ function get_uploaded_header_images() {
$header_images[$header_index]['url'] = $url;
$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'] ) )
$header_images[$header_index]['width'] = $header_data['width'];

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.9-beta2-41936';
$wp_version = '4.9-beta2-41937';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.