From 43fb40739db52310fc954b880904cdbe4b7bad99 Mon Sep 17 00:00:00 2001 From: Andrea Fercia Date: Sun, 9 Feb 2020 16:30:41 +0000 Subject: [PATCH] Accessibility: Media: Make the toolbar and inline uploader visual order always match the DOM order. Depending on the specific media view, the media UI elements are placed in a different visual order. This change makes sure their visual order always matches the DOM order. Propos syhc, audrasjb, afercia. See #37188. Fixes #48403. git-svn-id: https://develop.svn.wordpress.org/trunk@47217 602fd350-edb4-49c9-b593-d223f7449a82 --- src/js/media/views/attachments/browser.js | 26 +++++++++++++++-------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/src/js/media/views/attachments/browser.js b/src/js/media/views/attachments/browser.js index 4a4289149d..fa1a79ea36 100644 --- a/src/js/media/views/attachments/browser.js +++ b/src/js/media/views/attachments/browser.js @@ -49,17 +49,25 @@ AttachmentsBrowser = View.extend(/** @lends wp.media.view.AttachmentsBrowser.pro } /* - * For accessibility reasons, place the Inline Uploader before other sections. - * This way, in the Media Library, it's right after the Add New button, see ticket #37188. + * In the grid mode (the Media Library), place the Inline Uploader before + * other sections so that the visual order and the DOM order match. This way, + * the Inline Uploader in the Media Library is right after the "Add New" + * button, see ticket #37188. */ - this.createUploader(); + if ( this.controller.isModeActive( 'grid' ) ) { + this.createUploader(); + + /* + * Create a multi-purpose toolbar. Used as main toolbar in the Media Library + * and also for other things, for example the "Drag and drop to reorder" and + * "Suggested dimensions" info in the media modal. + */ + this.createToolbar(); + } else { + this.createToolbar(); + this.createUploader(); + } - /* - * Create a multi-purpose toolbar. Used as main toolbar in the Media Library - * and also for other things, for example the "Drag and drop to reorder" and - * "Suggested dimensions" info in the media modal. - */ - this.createToolbar(); // Add a heading before the attachments list. this.createAttachmentsHeading();