Skip to content

Media: Match the DOM order of the media modal header to its visual order #15949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ozgursar wants to merge 1 commit into
base: trunk
Choose a base branch
from
+4 −1
Open

Media: Match the DOM order of the media modal header to its visual order #15949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/js/media/views/modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@ Modal = wp.media.View.extend(/** @lends wp.media.view.Modal.prototype */{
this.attach();
}

// Match the DOM order to the visual order: place the close button after the frame title.
this.$( '.media-frame-title' ).first().after( this.$( '.media-modal' ).children( '.media-modal-close' ) );

// Disable page scrolling.
$( 'body' ).addClass( 'modal-open' );

Expand Down
2 changes: 1 addition & 1 deletion src/wp-includes/media-template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,12 +362,12 @@ function wp_print_media_templates() {

<?php // Template for the Attachment Details layout in the media browser. ?>
<script type="text/html" id="tmpl-edit-attachment-frame">
<div class="media-frame-title"></div>
<div class="edit-media-header">
<button class="left dashicons"<# if ( ! data.hasPrevious ) { #> aria-disabled='true'<# } #>><span class="screen-reader-text"><?php /* translators: Hidden accessibility text. */ _ex( 'Previous', 'media item' ); ?></span></button>
<button class="right dashicons"<# if ( ! data.hasNext ) { #> aria-disabled='true'<# } #>><span class="screen-reader-text"><?php /* translators: Hidden accessibility text. */ _ex( 'Next', 'media item' ); ?></span></button>
<button type="button" class="media-modal-close"><span class="media-modal-icon" aria-hidden="true"></span><span class="screen-reader-text"><?php _e( 'Close' ); ?></span></button>
</div>
<div class="media-frame-title"></div>
<div class="media-frame-content"></div>
</script>

Expand Down
Loading