WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Media: Prevents clipping of text when scaling image edit screen. 

Props sabernhardt, audrasjb, afercia.
See #47115.

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


git-svn-id: http://core.svn.wordpress.org/trunk@46153 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
antpb 2019-09-30 16:34:58 +00:00
parent 38e6958698
commit 7c8028febf
19 changed files with 68 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/css/edit-rtl.css
View File

@ -655,6 +655,12 @@ form#tags-filter {
margin-bottom: 20px;
}
.wp_attachment_details .attachment-content-description {
margin-top: 0.5385em;
display: inline-block;
min-height: 1.6923em;
}
/* Suggested text for privacy policy */
.wp-privacy-policy-guide {
max-width: 1000px;

2
wp-admin/css/edit-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

6
wp-admin/css/edit.css
View File

@ -655,6 +655,12 @@ form#tags-filter {
margin-bottom: 20px;
}
.wp_attachment_details .attachment-content-description {
margin-top: 0.5385em;
display: inline-block;
min-height: 1.6923em;
}
/* Suggested text for privacy policy */
.wp-privacy-policy-guide {
max-width: 1000px;

2
wp-admin/css/edit.min.css vendored
View File

File diff suppressed because one or more lines are too long

16
wp-admin/css/media-rtl.css
View File

@ -800,6 +800,11 @@ border color while dragging a file over the uploader drop area */
margin-bottom: 5px;
}
.attachment-details .setting + .description a:focus {
/* Only visible in Windows High Contrast mode */
outline: 1px solid transparent;
}
.wp_attachment_details .attachment-alt-text-description {
margin-top: 5px;
}
@ -1114,10 +1119,14 @@ span.imgedit-scale-warn {
padding: 10px;
}
.imgedit-settings .imgedit-original-dimensions {
display: inline-block;
}
.imgedit-settings .imgedit-scale input[type="text"],
.imgedit-settings .imgedit-crop-ratio input[type="text"],
.imgedit-settings .imgedit-crop-sel input[type="text"] {
width: 50px;
width: 80px;
font-size: 14px;
padding: 5px 8px;
}
@ -1130,6 +1139,11 @@ span.imgedit-scale-warn {
color: #444;
}
.imgedit-settings .imgedit-scale-button-wrapper {
margin-top: 0.3077em;
display: block;
}
.imgedit-settings .imgedit-scale .button {
margin-bottom: 0;
}

2
wp-admin/css/media-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

16
wp-admin/css/media.css
View File

@ -800,6 +800,11 @@ border color while dragging a file over the uploader drop area */
margin-bottom: 5px;
}
.attachment-details .setting + .description a:focus {
/* Only visible in Windows High Contrast mode */
outline: 1px solid transparent;
}
.wp_attachment_details .attachment-alt-text-description {
margin-top: 5px;
}
@ -1114,10 +1119,14 @@ span.imgedit-scale-warn {
padding: 10px;
}
.imgedit-settings .imgedit-original-dimensions {
display: inline-block;
}
.imgedit-settings .imgedit-scale input[type="text"],
.imgedit-settings .imgedit-crop-ratio input[type="text"],
.imgedit-settings .imgedit-crop-sel input[type="text"] {
width: 50px;
width: 80px;
font-size: 14px;
padding: 5px 8px;
}
@ -1130,6 +1139,11 @@ span.imgedit-scale-warn {
color: #444;
}
.imgedit-settings .imgedit-scale-button-wrapper {
margin-top: 0.3077em;
display: block;
}
.imgedit-settings .imgedit-scale .button {
margin-bottom: 0;
}

2
wp-admin/css/media.min.css vendored
View File

File diff suppressed because one or more lines are too long

10
wp-admin/includes/image-edit.php
View File

@ -38,9 +38,9 @@ function wp_image_editor( $post_id, $msg = false ) {
if ( $msg ) {
if ( isset( $msg->error ) ) {
$note = "<div class='error'><p>$msg->error</p></div>";
$note = "<div class='error' tabindex='-1' role='alert'><p>$msg->error</p></div>";
} elseif ( isset( $msg->msg ) ) {
$note = "<div class='updated'><p>$msg->msg</p></div>";
$note = "<div class='updated' tabindex='-1' role='alert'><p>$msg->msg</p></div>";
}
}
@ -62,7 +62,7 @@ function wp_image_editor( $post_id, $msg = false ) {
printf(
/* translators: %s: Image width and height in pixels. */
__( 'Original dimensions %s' ),
$meta['width'] . ' &times; ' . $meta['height']
'<span class="imgedit-original-dimensions">' . $meta['width'] . ' &times; ' . $meta['height'] . '</span>'
);
?>
</p>
@ -78,7 +78,7 @@ function wp_image_editor( $post_id, $msg = false ) {
<label for="imgedit-scale-height-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e( 'scale height' ); ?></label>
<input type="text" id="imgedit-scale-height-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
<span class="imgedit-scale-warn" id="imgedit-scale-warn-<?php echo $post_id; ?>">!</span>
<input id="imgedit-scale-button" type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'scale')" class="button button-primary" value="<?php esc_attr_e( 'Scale' ); ?>" />
<div class="imgedit-scale-button-wrapper"><input id="imgedit-scale-button" type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'scale')" class="button button-primary" value="<?php esc_attr_e( 'Scale' ); ?>" /></div>
</div>
</fieldset>
@ -235,7 +235,7 @@ function wp_image_editor( $post_id, $msg = false ) {
<input type="hidden" id="imgedit-y-<?php echo $post_id; ?>" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
<div id="imgedit-crop-<?php echo $post_id; ?>" class="imgedit-crop-wrap">
<img id="image-preview-<?php echo $post_id; ?>" onload="imageEdit.imgLoaded('<?php echo $post_id; ?>')" src="<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>?action=imgedit-preview&amp;_ajax_nonce=<?php echo $nonce; ?>&amp;postid=<?php echo $post_id; ?>&amp;rand=<?php echo rand( 1, 99999 ); ?>" alt="" />
<img id="image-preview-<?php echo $post_id; ?>" src="<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>?action=imgedit-preview&amp;_ajax_nonce=<?php echo $nonce; ?>&amp;postid=<?php echo $post_id; ?>&amp;rand=<?php echo rand( 1, 99999 ); ?>" alt="" />
</div>
<div class="imgedit-submit">

2
wp-admin/includes/media.php
View File

@ -3207,7 +3207,7 @@ function edit_form_image_editor( $post ) {
?>
<label for="attachment_content"><strong><?php _e( 'Description' ); ?></strong>
<label for="attachment_content" class="attachment-content-description"><strong><?php _e( 'Description' ); ?></strong>
<?php
if ( preg_match( '#^(audio|video)/#', $post->post_mime_type ) ) {

4
wp-admin/js/image-edit.js
View File

@ -503,7 +503,7 @@
// If a response is returned, close the editor and show an error.
if ( ret.error ) {
$('#imgedit-response-' + postid).html('<div class="error"><p>' + ret.error + '</p></div>');
$('#imgedit-response-' + postid).html('<div class="error" role="alert"><p>' + ret.error + '</p></div>');
imageEdit.close(postid);
return;
}
@ -517,7 +517,7 @@
}
if ( ret.msg ) {
$('#imgedit-response-' + postid).html('<div class="updated"><p>' + ret.msg + '</p></div>');
$('#imgedit-response-' + postid).html('<div class="updated" role="alert"><p>' + ret.msg + '</p></div>');
}
if ( self._view ) {

2
wp-admin/js/image-edit.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/css/editor-rtl.css
View File

@ -1322,7 +1322,7 @@ i.mce-i-wp_code:before {
.wp-core-ui .quicktags-toolbar input.button.button-small {
/* .button-small is normally 11px, but a bit too small for these buttons. */
font-size: 12px;
height: 26px;
min-height: 26px;
line-height: 2;
}
}

2
wp-includes/css/editor-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/css/editor.css
View File

@ -1322,7 +1322,7 @@ i.mce-i-wp_code:before {
.wp-core-ui .quicktags-toolbar input.button.button-small {
/* .button-small is normally 11px, but a bit too small for these buttons. */
font-size: 12px;
height: 26px;
min-height: 26px;
line-height: 2;
}
}

2
wp-includes/css/editor.min.css vendored
View File

File diff suppressed because one or more lines are too long

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

@ -3249,6 +3249,8 @@ Select = MediaFrame.extend(/** @lends wp.media.view.MediaFrame.Select.prototype
* Create the default states on the frame.
*/
createStates: function() {
console.log("test");
this.on( 'content:render:edit-image', this.editState, this );
var options = this.options;
if ( this.options.states ) {
@ -3263,7 +3265,8 @@ Select = MediaFrame.extend(/** @lends wp.media.view.MediaFrame.Select.prototype
multiple: options.multiple,
title: options.title,
priority: 20
})
}),
new wp.media.controller.EditImage( { model: this.options.editImage } ),
]);
},

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

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.3-beta1-46353';
$wp_version = '5.3-beta1-46354';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.