Changeset 40132

Timestamp:

02/27/2017 07:20:58 PM (8 years ago)

Author:

joemcgill

Message:

Media: Restore correct upload errors displaying after [37610].

Props codegeass, MatheusGimenez, joemcgill.
Merges [40126] to the 4.7 branch.
Fixes #39516.

Location:

branches/4.7

Files:

• . (modified) (1 prop)
• src/wp-includes/js/media-views.js (modified) (1 diff)
• src/wp-includes/js/media/views/attachments/browser.js (modified) (1 diff)

branches/4.7/src/wp-includes/js/media-views.js

@@ -3773 +3773 @@
         this.controller.on( 'edit:selection', this.editSelection );
         this.createToolbar();
+        // In the Media Library, the sidebar is used to display errors before the attachments grid.
+        if ( this.options.sidebar && 'errors' === this.options.sidebar ) {
+            this.createSidebar();
+        }
         this.createUploader();
         this.createAttachments();
-        if ( this.options.sidebar ) {
+        // For accessibility reasons, place the normal sidebar after the attachments, see ticket #36909.
+        if ( this.options.sidebar && 'errors' !== this.options.sidebar ) {
             this.createSidebar();
         }

branches/4.7/src/wp-includes/js/media/views/attachments/browser.js

@@ -42 +42 @@
         this.controller.on( 'edit:selection', this.editSelection );
         this.createToolbar();
+        // In the Media Library, the sidebar is used to display errors before the attachments grid.
+        if ( this.options.sidebar && 'errors' === this.options.sidebar ) {
+            this.createSidebar();
+        }
         this.createUploader();
         this.createAttachments();
-        if ( this.options.sidebar ) {
+        // For accessibility reasons, place the normal sidebar after the attachments, see ticket #36909.
+        if ( this.options.sidebar && 'errors' !== this.options.sidebar ) {
             this.createSidebar();
         }