Changeset 47217

Timestamp:

02/09/2020 04:30:41 PM (7 years ago)

Author:

afercia

Message:

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.

File:

• trunk/src/js/media/views/attachments/browser.js (modified) (1 diff)

trunk/src/js/media/views/attachments/browser.js

@@ -50 +50 @@
 
                 /*
-                 * 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();
-
-                /*
-                 * 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();
+                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();
+                }
+
 
                 // Add a heading before the attachments list.