<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[52059] trunk/src: Media: Change upload button to a file input for better e2e targeting.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/52059">52059</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/52059","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>antpb</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-11-08 22:47:09 +0000 (Mon, 08 Nov 2021)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Media: Change upload button to a file input for better e2e targeting.
Changes the media library upload button to `input type="file"` for better end to end testing capabilities.
Props justinahinon, joedolson, sabernhardt, audrasjb.
Fixes <a href="https://core.trac.wordpress.org/ticket/54168">#54168</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjsmediaviewsuploaderinlinejs">trunk/src/js/media/views/uploader/inline.js</a></li>
<li><a href="#trunksrcjsmediaviewsuploaderwindowjs">trunk/src/js/media/views/uploader/window.js</a></li>
<li><a href="#trunksrcwpadminincludesmediaphp">trunk/src/wp-admin/includes/media.php</a></li>
<li><a href="#trunksrcwpincludescssbuttonscss">trunk/src/wp-includes/css/buttons.css</a></li>
<li><a href="#trunksrcwpincludesmediatemplatephp">trunk/src/wp-includes/media-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjsmediaviewsuploaderinlinejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/uploader/inline.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/uploader/inline.js 2021-11-08 22:36:11 UTC (rev 52058)
+++ trunk/src/js/media/views/uploader/inline.js 2021-11-08 22:47:09 UTC (rev 52059)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,7 +106,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $placeholder;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( this.controller.uploader ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $placeholder = this.$('.browser');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $placeholder = this.$('.browser-container');
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check if we've already replaced the placeholder.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $placeholder[0] === $browser[0] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,9 +113,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $browser.detach().text( $placeholder.text() );
- $browser[0].className = $placeholder[0].className;
- $browser[0].setAttribute( 'aria-labelledby', $browser[0].id + ' ' + $placeholder[0].getAttribute('aria-labelledby') );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var browserLabel = $placeholder.find( 'label' );
+ var browserInput = $placeholder.find( 'input' );
+
+ browserLabel.attr( 'for', $browser[0].id );
+ browserInput.attr( 'id', $browser[0].id );
+ $browser.removeAttr( 'id' );
+
+ $browser.append( browserLabel ).append( browserInput );
</ins><span class="cx" style="display: block; padding: 0 10px"> $placeholder.replaceWith( $browser.show() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcjsmediaviewsuploaderwindowjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/media/views/uploader/window.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/media/views/uploader/window.js 2021-11-08 22:36:11 UTC (rev 52058)
+++ trunk/src/js/media/views/uploader/window.js 2021-11-08 22:47:09 UTC (rev 52059)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> initialize: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var uploader;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.$browser = $( '<button type="button" class="browser" />' ).hide().appendTo( 'body' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.$browser = $( '<div class="browser-container">' ).hide().appendTo( 'body' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> uploader = this.options.uploader = _.defaults( this.options.uploader || {}, {
</span><span class="cx" style="display: block; padding: 0 10px"> dropzone: this.$el,
</span></span></pre></div>
<a id="trunksrcwpadminincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/media.php 2021-11-08 22:36:11 UTC (rev 52058)
+++ trunk/src/wp-admin/includes/media.php 2021-11-08 22:47:09 UTC (rev 52059)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2246,7 +2246,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="drag-drop-inside">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="drag-drop-info"><?php _e( 'Drop files to upload' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _ex( 'or', 'Uploader: Drop files here - or - Select Files' ); ?></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="drag-drop-buttons"><input id="plupload-browse-button" type="button" value="<?php esc_attr_e( 'Select Files' ); ?>" class="button" /></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="drag-drop-buttons"><label for="plupload-browse-button" id="plupload-browse-label" class="button button-hero"><?php esc_html_e( 'Select Files' ); ?></label><input id="plupload-browse-button" type="file" class="screen-reader-text" aria-labelledby="plupload-browse-label post-upload-info" /></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2288,7 +2288,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p class="max-upload-size">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p class="max-upload-size" id="post-upload-info">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Maximum allowed file size. */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'Maximum upload file size: %s.' ), esc_html( size_format( $max_upload_size ) ) );
</span></span></pre></div>
<a id="trunksrcwpincludescssbuttonscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/css/buttons.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/css/buttons.css 2021-11-08 22:36:11 UTC (rev 52058)
+++ trunk/src/wp-includes/css/buttons.css 2021-11-08 22:47:09 UTC (rev 52059)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,6 +133,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> color: #0a4b78;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* Support focus state on label designed as button in media uploader. */
+.drag-drop-inside p.drag-drop-buttons:focus-within label.button,
+.uploader-inline-content div.browser-container:focus-within label.button,
</ins><span class="cx" style="display: block; padding: 0 10px"> .wp-core-ui .button.focus,
</span><span class="cx" style="display: block; padding: 0 10px"> .wp-core-ui .button:focus,
</span><span class="cx" style="display: block; padding: 0 10px"> .wp-core-ui .button-secondary:focus {
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/media-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media-template.php 2021-11-08 22:36:11 UTC (rev 52058)
+++ trunk/src/wp-includes/media-template.php 2021-11-08 22:47:09 UTC (rev 52059)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -252,7 +252,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="upload-ui">
</span><span class="cx" style="display: block; padding: 0 10px"> <h2 class="upload-instructions drop-instructions"><?php _e( 'Drop files to upload' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="upload-instructions drop-instructions"><?php _ex( 'or', 'Uploader: Drop files here - or - Select Files' ); ?></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <button type="button" class="browser button button-hero" aria-labelledby="post-upload-info"><?php _e( 'Select Files' ); ?></button>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="browser-container">
+ <label class="button button-hero"><?php esc_html_e( 'Select Files' ); ?></label>
+ <input type="file" class="browser screen-reader-text" aria-describedby="post-upload-info">
+ </div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="upload-inline-status"></div>
</span></span></pre>
</div>
</div>
</body>
</html>