sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

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


git-svn-id: https://develop.svn.wordpress.org/branches/4.7@40132 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Joe McGill 2017-02-27 19:20:58 +00:00
parent 7182e5b7b4
commit 2e5f3b41a8
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wp-includes/js/media-views.js
View File

@ -3772,9 +3772,14 @@ AttachmentsBrowser = View.extend({
this.controller.on( 'toggle:upload:attachment', this.toggleUploader, this ); this.controller.on( 'toggle:upload:attachment', this.toggleUploader, this );
this.controller.on( 'edit:selection', this.editSelection ); this.controller.on( 'edit:selection', this.editSelection );
this.createToolbar(); 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.createUploader();
this.createAttachments(); 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(); this.createSidebar();
} }
this.updateContent(); this.updateContent();

7
src/wp-includes/js/media/views/attachments/browser.js
View File

@ -41,9 +41,14 @@ AttachmentsBrowser = View.extend({
this.controller.on( 'toggle:upload:attachment', this.toggleUploader, this ); this.controller.on( 'toggle:upload:attachment', this.toggleUploader, this );
this.controller.on( 'edit:selection', this.editSelection ); this.controller.on( 'edit:selection', this.editSelection );
this.createToolbar(); 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.createUploader();
this.createAttachments(); 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(); this.createSidebar();
} }
this.updateContent(); this.updateContent();