<!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>[41550] trunk/src/wp-includes: Customize: Let media control button labels better automatically reflect the specified MIME type.</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 { 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/41550">41550</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/41550","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>westonruter</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-09-20 21:23:51 +0000 (Wed, 20 Sep 2017)</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'>Customize: Let media control button labels better automatically reflect the specified MIME type.
Props Christian1012, celloexpressions, westonruter.
Fixes <a href="https://core.trac.wordpress.org/ticket/38796">#38796</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpcustomizemanagerphp">trunk/src/wp-includes/class-wp-customize-manager.php</a></li>
<li><a href="#trunksrcwpincludescustomizeclasswpcustomizeimagecontrolphp">trunk/src/wp-includes/customize/class-wp-customize-image-control.php</a></li>
<li><a href="#trunksrcwpincludescustomizeclasswpcustomizemediacontrolphp">trunk/src/wp-includes/customize/class-wp-customize-media-control.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpcustomizemanagerphp"></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/class-wp-customize-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-manager.php 2017-09-20 19:44:13 UTC (rev 41549)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2017-09-20 21:23:51 UTC (rev 41550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4004,14 +4004,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => $control_description,
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'header_image',
</span><span class="cx" style="display: block; padding: 0 10px"> 'mime_type' => 'video',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // @todo These button_labels can be removed once WP_Customize_Media_Control provides mime_type-specific labels automatically. See <https://core.trac.wordpress.org/ticket/38796>.
- 'button_labels' => array(
- 'select' => __( 'Select Video' ),
- 'change' => __( 'Change Video' ),
- 'placeholder' => __( 'No video selected' ),
- 'frame_title' => __( 'Select Video' ),
- 'frame_button' => __( 'Choose Video' ),
- ),
</del><span class="cx" style="display: block; padding: 0 10px"> 'active_callback' => 'is_header_video_active',
</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="trunksrcwpincludescustomizeclasswpcustomizeimagecontrolphp"></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/customize/class-wp-customize-image-control.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/customize/class-wp-customize-image-control.php 2017-09-20 19:44:13 UTC (rev 41549)
+++ trunk/src/wp-includes/customize/class-wp-customize-image-control.php 2017-09-20 21:23:51 UTC (rev 41550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,30 +19,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $mime_type = 'image';
</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">- * Constructor.
- *
- * @since 3.4.0
- * @uses WP_Customize_Upload_Control::__construct()
- *
- * @param WP_Customize_Manager $manager Customizer bootstrap instance.
- * @param string $id Control ID.
- * @param array $args Optional. Arguments to override class property defaults.
- */
- public function __construct( $manager, $id, $args = array() ) {
- parent::__construct( $manager, $id, $args );
-
- $this->button_labels = wp_parse_args( $this->button_labels, array(
- 'select' => __( 'Select Image' ),
- 'change' => __( 'Change Image' ),
- 'remove' => __( 'Remove' ),
- 'default' => __( 'Default' ),
- 'placeholder' => __( 'No image selected' ),
- 'frame_title' => __( 'Select Image' ),
- 'frame_button' => __( 'Choose Image' ),
- ) );
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * @since 3.4.2
</span><span class="cx" style="display: block; padding: 0 10px"> * @deprecated 4.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunksrcwpincludescustomizeclasswpcustomizemediacontrolphp"></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/customize/class-wp-customize-media-control.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/customize/class-wp-customize-media-control.php 2017-09-20 19:44:13 UTC (rev 41549)
+++ trunk/src/wp-includes/customize/class-wp-customize-media-control.php 2017-09-20 21:23:51 UTC (rev 41550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,17 +52,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct( $manager, $id, $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::__construct( $manager, $id, $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! ( $this instanceof WP_Customize_Image_Control ) ) {
- $this->button_labels = wp_parse_args( $this->button_labels, array(
- 'select' => __( 'Select File' ),
- 'change' => __( 'Change File' ),
- 'default' => __( 'Default' ),
- 'remove' => __( 'Remove' ),
- 'placeholder' => __( 'No file selected' ),
- 'frame_title' => __( 'Select File' ),
- 'frame_button' => __( 'Choose File' ),
- ) );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->button_labels = wp_parse_args( $this->button_labels, $this->get_default_button_labels() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,4 +199,61 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Get default button labels.
+ *
+ * Provides an array of the default button labels based on the mime type of the current control.
+ *
+ * @since 4.9.0
+ *
+ * @return array An associative array of default button labels.
+ */
+ public function get_default_button_labels() {
+ // Get just the mime type and strip the mime subtype if present.
+ $mime_type = ! empty( $this->mime_type ) ? strtok( ltrim( $this->mime_type, '/' ), '/' ) : 'default';
+
+ switch ( $mime_type ) {
+ case 'video':
+ return array(
+ 'select' => __( 'Select video' ),
+ 'change' => __( 'Change video' ),
+ 'default' => __( 'Default' ),
+ 'remove' => __( 'Remove' ),
+ 'placeholder' => __( 'No video selected' ),
+ 'frame_title' => __( 'Select video' ),
+ 'frame_button' => __( 'Choose video' ),
+ );
+ case 'audio':
+ return array(
+ 'select' => __( 'Select audio' ),
+ 'change' => __( 'Change audio' ),
+ 'default' => __( 'Default' ),
+ 'remove' => __( 'Remove' ),
+ 'placeholder' => __( 'No audio selected' ),
+ 'frame_title' => __( 'Select audio' ),
+ 'frame_button' => __( 'Choose audio' ),
+ );
+ case 'image':
+ return array(
+ 'select' => __( 'Select image' ),
+ 'change' => __( 'Change image' ),
+ 'default' => __( 'Default' ),
+ 'remove' => __( 'Remove' ),
+ 'placeholder' => __( 'No image selected' ),
+ 'frame_title' => __( 'Select image' ),
+ 'frame_button' => __( 'Choose image' ),
+ );
+ default:
+ return array(
+ 'select' => __( 'Select file' ),
+ 'change' => __( 'Change file' ),
+ 'default' => __( 'Default' ),
+ 'remove' => __( 'Remove' ),
+ 'placeholder' => __( 'No file selected' ),
+ 'frame_title' => __( 'Select file' ),
+ 'frame_button' => __( 'Choose file' ),
+ );
+ } // End switch().
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>