From 2a86d8d534491eb1033d2988ca855f4249ead9de Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Wed, 20 May 2020 13:33:07 +0000
Subject: [PATCH] Accessibility: Media: Hide the invisible "file input" on
 media views from assistive technologies.

The file input button is visually hidden, but was announced by screen readers in workflows unrelated to file uploads.
It is now hidden from assistive technologies by the means of an `aria-hidden` attribute, as its CSS display property must not be changed to make sure it still works on old browsers.

See #49753.
Fixes #47611.

Built from https://develop.svn.wordpress.org/trunk@47834


git-svn-id: http://core.svn.wordpress.org/trunk@47610 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/js/plupload/wp-plupload.js     | 19 ++++++++++++-------
 wp-includes/js/plupload/wp-plupload.min.js |  2 +-
 wp-includes/version.php                    |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/wp-includes/js/plupload/wp-plupload.js b/wp-includes/js/plupload/wp-plupload.js
index e42288fbe4..6839fd81d7 100644
--- a/wp-includes/js/plupload/wp-plupload.js
+++ b/wp-includes/js/plupload/wp-plupload.js
@@ -120,8 +120,7 @@ window.wp = window.wp || {};
 		 * @param  {plupload.File} file     File that was uploaded.
 		 */
 		tryAgain = function( message, data, file ) {
-			var times;
-			var id;
+			var times, id;
 
 			if ( ! data || ! data.responseHeaders ) {
 				error( pluploadL10n.http_error_image, data, file, 'no-retry' );
@@ -210,8 +209,8 @@ window.wp = window.wp || {};
 		 * @param  {string}        retry    Whether to try again to create image sub-sizes. Passing 'no-retry' will prevent it.
 		 */
 		error = function( message, data, file, retry ) {
-			var isImage = file.type && file.type.indexOf( 'image/' ) === 0;
-			var status  = data && data.status;
+			var isImage = file.type && file.type.indexOf( 'image/' ) === 0,
+				status = data && data.status;
 
 			// If the file is an image and the error is HTTP 5xx try to create sub-sizes again.
 			if ( retry !== 'no-retry' && isImage && status >= 500 && status < 600 ) {
@@ -327,10 +326,16 @@ window.wp = window.wp || {};
 			this.browser.on( 'mouseenter', this.refresh );
 		} else {
 			this.uploader.disableBrowse( true );
-			// If HTML5 mode, hide the auto-created file container.
-			$('#' + this.uploader.id + '_html5_container').hide();
 		}
 
+		$( self ).on( 'uploader:ready', function() {
+			$( '.moxie-shim-html5 input[type="file"]' )
+				.attr( {
+					tabIndex:      '-1',
+					'aria-hidden': 'true'
+				} );
+		} );
+
 		/**
 		 * After files were filtered and added to the queue, create a model for each.
 		 *
@@ -521,7 +526,7 @@ window.wp = window.wp || {};
 
 				/*
 				 * If the browser node is not attached to the DOM,
-				 * use a temporary container to house it, as the browser button shims 
+				 * use a temporary container to house it, as the browser button shims
 				 * require the button to exist in the DOM at all times.
 				 */
 				if ( ! attached ) {
diff --git a/wp-includes/js/plupload/wp-plupload.min.js b/wp-includes/js/plupload/wp-plupload.min.js
index bd612b1415..f95d5eeabe 100644
--- a/wp-includes/js/plupload/wp-plupload.min.js
+++ b/wp-includes/js/plupload/wp-plupload.min.js
@@ -1 +1 @@
-window.wp=window.wp||{},function(e,l){var u;"undefined"!=typeof _wpPluploadSettings&&(u=function(e){var n,t,i,d,p=this,r={container:"container",browser:"browse_button",dropzone:"drop_element"},s={};if(this.supports={upload:u.browser.supported},this.supported=this.supports.upload,this.supported){for(t in this.plupload=l.extend(!0,{multipart_params:{}},u.defaults),this.container=document.body,l.extend(!0,this,e),this)l.isFunction(this[t])&&(this[t]=l.proxy(this[t],this));for(t in r)this[t]&&(this[t]=l(this[t]).first(),this[t].length?(this[t].prop("id")||this[t].prop("id","__wp-uploader-id-"+u.uuid++),this.plupload[r[t]]=this[t].prop("id")):delete this[t]);(this.browser&&this.browser.length||this.dropzone&&this.dropzone.length)&&(this.uploader=new plupload.Uploader(this.plupload),delete this.plupload,this.param(this.params||{}),delete this.params,n=function(t,r,a){var e,o;if(r&&r.responseHeaders)if((o=r.responseHeaders.match(/x-wp-upload-attachment-id:\s*(\d+)/i))&&o[1]){if(o=o[1],(e=s[a.id])&&4<e)return l.ajax({type:"post",url:ajaxurl,dataType:"json",data:{action:"media-create-image-subsizes",_wpnonce:_wpPluploadSettings.defaults.multipart_params._wpnonce,attachment_id:o,_wp_upload_failed_cleanup:!0}}),void i(t,r,a,"no-retry");s[a.id]=e?++e:1,l.ajax({type:"post",url:ajaxurl,dataType:"json",data:{action:"media-create-image-subsizes",_wpnonce:_wpPluploadSettings.defaults.multipart_params._wpnonce,attachment_id:o}}).done(function(e){e.success?d(p.uploader,a,e):(e.data&&e.data.message&&(t=e.data.message),i(t,r,a,"no-retry"))}).fail(function(e){500<=e.status&&e.status<600?n(t,r,a):i(t,r,a,"no-retry")})}else i(pluploadL10n.http_error_image,r,a,"no-retry");else i(pluploadL10n.http_error_image,r,a,"no-retry")},i=function(e,t,r,a){var o=r.type&&0===r.type.indexOf("image/"),i=t&&t.status;"no-retry"!==a&&o&&500<=i&&i<600?n(e,t,r):(r.attachment&&r.attachment.destroy(),u.errors.unshift({message:e||pluploadL10n.default_error,data:t,file:r}),p.error(e,t,r))},d=function(e,t,r){_.each(["file","loaded","size","percent"],function(e){t.attachment.unset(e)}),t.attachment.set(_.extend(r.data,{uploading:!1})),wp.media.model.Attachment.get(r.data.id,t.attachment),u.queue.all(function(e){return!e.get("uploading")})&&u.queue.reset(),p.success(t.attachment)},this.uploader.bind("init",function(e){var t,r,a,o=p.dropzone;if(a=p.supports.dragdrop=e.features.dragdrop&&!u.browser.mobile,o){if(o.toggleClass("supports-drag-drop",!!a),!a)return o.unbind(".wp-uploader");o.bind("dragover.wp-uploader",function(){t&&clearTimeout(t),r||(o.trigger("dropzone:enter").addClass("drag-over"),r=!0)}),o.bind("dragleave.wp-uploader, drop.wp-uploader",function(){t=setTimeout(function(){r=!1,o.trigger("dropzone:leave").removeClass("drag-over")},0)}),p.ready=!0,l(p).trigger("uploader:ready")}}),this.uploader.bind("postinit",function(e){e.refresh(),p.init()}),this.uploader.init(),this.browser?this.browser.on("mouseenter",this.refresh):(this.uploader.disableBrowse(!0),l("#"+this.uploader.id+"_html5_container").hide()),this.uploader.bind("FilesAdded",function(e,t){_.each(t,function(e){var t,r;plupload.FAILED!==e.status&&(t=_.extend({file:e,uploading:!0,date:new Date,filename:e.name,menuOrder:0,uploadedTo:wp.media.model.settings.post.id},_.pick(e,"loaded","size","percent")),(r=/(?:jpe?g|png|gif)$/i.exec(e.name))&&(t.type="image",t.subtype="jpg"===r[0]?"jpeg":r[0]),e.attachment=wp.media.model.Attachment.create(t),u.queue.add(e.attachment),p.added(e.attachment))}),e.refresh(),e.start()}),this.uploader.bind("UploadProgress",function(e,t){t.attachment.set(_.pick(t,"loaded","percent")),p.progress(t.attachment)}),this.uploader.bind("FileUploaded",function(e,t,r){try{r=JSON.parse(r.response)}catch(e){return i(pluploadL10n.default_error,e,t)}return!_.isObject(r)||_.isUndefined(r.success)?i(pluploadL10n.default_error,null,t):r.success?void d(e,t,r):i(r.data&&r.data.message,r.data,t)}),this.uploader.bind("Error",function(e,t){var r,a=pluploadL10n.default_error;for(r in u.errorMap)if(t.code===plupload[r]){a=u.errorMap[r],_.isFunction(a)&&(a=a(t.file,t));break}i(a,t,t.file),e.refresh()}))}},l.extend(u,_wpPluploadSettings),u.uuid=0,u.errorMap={FAILED:pluploadL10n.upload_failed,FILE_EXTENSION_ERROR:pluploadL10n.invalid_filetype,IMAGE_FORMAT_ERROR:pluploadL10n.not_an_image,IMAGE_MEMORY_ERROR:pluploadL10n.image_memory_exceeded,IMAGE_DIMENSIONS_ERROR:pluploadL10n.image_dimensions_exceeded,GENERIC_ERROR:pluploadL10n.upload_failed,IO_ERROR:pluploadL10n.io_error,SECURITY_ERROR:pluploadL10n.security_error,FILE_SIZE_ERROR:function(e){return pluploadL10n.file_exceeds_size_limit.replace("%s",e.name)},HTTP_ERROR:function(e){return e.type&&0===e.type.indexOf("image/")?pluploadL10n.http_error_image:pluploadL10n.http_error}},l.extend(u.prototype,{param:function(e,t){if(1===arguments.length&&"string"==typeof e)return this.uploader.settings.multipart_params[e];1<arguments.length?this.uploader.settings.multipart_params[e]=t:l.extend(this.uploader.settings.multipart_params,e)},init:function(){},error:function(){},success:function(){},added:function(){},progress:function(){},complete:function(){},refresh:function(){var e,t,r,a;if(this.browser){for(e=this.browser[0];e;){if(e===document.body){t=!0;break}e=e.parentNode}t||(a="wp-uploader-browser-"+this.uploader.id,(r=l("#"+a)).length||(r=l('<div class="wp-uploader-browser" />').css({position:"fixed",top:"-1000px",left:"-1000px",height:0,width:0}).attr("id","wp-uploader-browser-"+this.uploader.id).appendTo("body")),r.append(this.browser))}this.uploader.refresh()}}),u.queue=new wp.media.model.Attachments([],{query:!1}),u.errors=new Backbone.Collection,e.Uploader=u)}(wp,jQuery);
\ No newline at end of file
+window.wp=window.wp||{},function(e,u){var l;"undefined"!=typeof _wpPluploadSettings&&(l=function(e){var n,t,i,d,p=this,a={container:"container",browser:"browse_button",dropzone:"drop_element"},s={};if(this.supports={upload:l.browser.supported},this.supported=this.supports.upload,this.supported){for(t in this.plupload=u.extend(!0,{multipart_params:{}},l.defaults),this.container=document.body,u.extend(!0,this,e),this)u.isFunction(this[t])&&(this[t]=u.proxy(this[t],this));for(t in a)this[t]&&(this[t]=u(this[t]).first(),this[t].length?(this[t].prop("id")||this[t].prop("id","__wp-uploader-id-"+l.uuid++),this.plupload[a[t]]=this[t].prop("id")):delete this[t]);(this.browser&&this.browser.length||this.dropzone&&this.dropzone.length)&&(this.uploader=new plupload.Uploader(this.plupload),delete this.plupload,this.param(this.params||{}),delete this.params,n=function(t,a,r){var e,o;if(a&&a.responseHeaders)if((o=a.responseHeaders.match(/x-wp-upload-attachment-id:\s*(\d+)/i))&&o[1]){if(o=o[1],(e=s[r.id])&&4<e)return u.ajax({type:"post",url:ajaxurl,dataType:"json",data:{action:"media-create-image-subsizes",_wpnonce:_wpPluploadSettings.defaults.multipart_params._wpnonce,attachment_id:o,_wp_upload_failed_cleanup:!0}}),void i(t,a,r,"no-retry");s[r.id]=e?++e:1,u.ajax({type:"post",url:ajaxurl,dataType:"json",data:{action:"media-create-image-subsizes",_wpnonce:_wpPluploadSettings.defaults.multipart_params._wpnonce,attachment_id:o}}).done(function(e){e.success?d(p.uploader,r,e):(e.data&&e.data.message&&(t=e.data.message),i(t,a,r,"no-retry"))}).fail(function(e){500<=e.status&&e.status<600?n(t,a,r):i(t,a,r,"no-retry")})}else i(pluploadL10n.http_error_image,a,r,"no-retry");else i(pluploadL10n.http_error_image,a,r,"no-retry")},i=function(e,t,a,r){var o=a.type&&0===a.type.indexOf("image/"),i=t&&t.status;"no-retry"!==r&&o&&500<=i&&i<600?n(e,t,a):(a.attachment&&a.attachment.destroy(),l.errors.unshift({message:e||pluploadL10n.default_error,data:t,file:a}),p.error(e,t,a))},d=function(e,t,a){_.each(["file","loaded","size","percent"],function(e){t.attachment.unset(e)}),t.attachment.set(_.extend(a.data,{uploading:!1})),wp.media.model.Attachment.get(a.data.id,t.attachment),l.queue.all(function(e){return!e.get("uploading")})&&l.queue.reset(),p.success(t.attachment)},this.uploader.bind("init",function(e){var t,a,r,o=p.dropzone;if(r=p.supports.dragdrop=e.features.dragdrop&&!l.browser.mobile,o){if(o.toggleClass("supports-drag-drop",!!r),!r)return o.unbind(".wp-uploader");o.bind("dragover.wp-uploader",function(){t&&clearTimeout(t),a||(o.trigger("dropzone:enter").addClass("drag-over"),a=!0)}),o.bind("dragleave.wp-uploader, drop.wp-uploader",function(){t=setTimeout(function(){a=!1,o.trigger("dropzone:leave").removeClass("drag-over")},0)}),p.ready=!0,u(p).trigger("uploader:ready")}}),this.uploader.bind("postinit",function(e){e.refresh(),p.init()}),this.uploader.init(),this.browser?this.browser.on("mouseenter",this.refresh):this.uploader.disableBrowse(!0),u(p).on("uploader:ready",function(){u('.moxie-shim-html5 input[type="file"]').attr({tabIndex:"-1","aria-hidden":"true"})}),this.uploader.bind("FilesAdded",function(e,t){_.each(t,function(e){var t,a;plupload.FAILED!==e.status&&(t=_.extend({file:e,uploading:!0,date:new Date,filename:e.name,menuOrder:0,uploadedTo:wp.media.model.settings.post.id},_.pick(e,"loaded","size","percent")),(a=/(?:jpe?g|png|gif)$/i.exec(e.name))&&(t.type="image",t.subtype="jpg"===a[0]?"jpeg":a[0]),e.attachment=wp.media.model.Attachment.create(t),l.queue.add(e.attachment),p.added(e.attachment))}),e.refresh(),e.start()}),this.uploader.bind("UploadProgress",function(e,t){t.attachment.set(_.pick(t,"loaded","percent")),p.progress(t.attachment)}),this.uploader.bind("FileUploaded",function(e,t,a){try{a=JSON.parse(a.response)}catch(e){return i(pluploadL10n.default_error,e,t)}return!_.isObject(a)||_.isUndefined(a.success)?i(pluploadL10n.default_error,null,t):a.success?void d(e,t,a):i(a.data&&a.data.message,a.data,t)}),this.uploader.bind("Error",function(e,t){var a,r=pluploadL10n.default_error;for(a in l.errorMap)if(t.code===plupload[a]){r=l.errorMap[a],_.isFunction(r)&&(r=r(t.file,t));break}i(r,t,t.file),e.refresh()}))}},u.extend(l,_wpPluploadSettings),l.uuid=0,l.errorMap={FAILED:pluploadL10n.upload_failed,FILE_EXTENSION_ERROR:pluploadL10n.invalid_filetype,IMAGE_FORMAT_ERROR:pluploadL10n.not_an_image,IMAGE_MEMORY_ERROR:pluploadL10n.image_memory_exceeded,IMAGE_DIMENSIONS_ERROR:pluploadL10n.image_dimensions_exceeded,GENERIC_ERROR:pluploadL10n.upload_failed,IO_ERROR:pluploadL10n.io_error,SECURITY_ERROR:pluploadL10n.security_error,FILE_SIZE_ERROR:function(e){return pluploadL10n.file_exceeds_size_limit.replace("%s",e.name)},HTTP_ERROR:function(e){return e.type&&0===e.type.indexOf("image/")?pluploadL10n.http_error_image:pluploadL10n.http_error}},u.extend(l.prototype,{param:function(e,t){if(1===arguments.length&&"string"==typeof e)return this.uploader.settings.multipart_params[e];1<arguments.length?this.uploader.settings.multipart_params[e]=t:u.extend(this.uploader.settings.multipart_params,e)},init:function(){},error:function(){},success:function(){},added:function(){},progress:function(){},complete:function(){},refresh:function(){var e,t,a,r;if(this.browser){for(e=this.browser[0];e;){if(e===document.body){t=!0;break}e=e.parentNode}t||(r="wp-uploader-browser-"+this.uploader.id,(a=u("#"+r)).length||(a=u('<div class="wp-uploader-browser" />').css({position:"fixed",top:"-1000px",left:"-1000px",height:0,width:0}).attr("id","wp-uploader-browser-"+this.uploader.id).appendTo("body")),a.append(this.browser))}this.uploader.refresh()}}),l.queue=new wp.media.model.Attachments([],{query:!1}),l.errors=new Backbone.Collection,e.Uploader=l)}(wp,jQuery);
\ No newline at end of file
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6af3c36e77..e67290ef2f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-alpha-47832';
+$wp_version = '5.5-alpha-47834';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.