X-Git-Url: https://scripts.mit.edu/gitweb/autoinstallsdev/wordpress.git/blobdiff_plain/03f2fa83c13c1b532284205fa7efcab9b8b2c41f..607b7e02d77e7326161e8ec15639052d2040f745:/wp-includes/customize/class-wp-customize-media-control.php

diff --git a/wp-includes/customize/class-wp-customize-media-control.php b/wp-includes/customize/class-wp-customize-media-control.php
index c99fd986..f3ec32b4 100644
--- a/wp-includes/customize/class-wp-customize-media-control.php
+++ b/wp-includes/customize/class-wp-customize-media-control.php
@@ -55,15 +55,17 @@ class WP_Customize_Media_Control extends WP_Customize_Control {
 	public function __construct( $manager, $id, $args = array() ) {
 		parent::__construct( $manager, $id, $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' ),
-		);
+		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' ),
+			) );
+		}
 	}
 
 	/**
@@ -152,72 +154,62 @@ class WP_Customize_Media_Control extends WP_Customize_Control {
 		</label>
 
 		<# if ( data.attachment && data.attachment.id ) { #>
-			<div class="current">
-				<div class="container">
-					<div class="attachment-media-view attachment-media-view-{{ data.attachment.type }} {{ data.attachment.orientation }}">
-						<div class="thumbnail thumbnail-{{ data.attachment.type }}">
-							<# if ( 'image' === data.attachment.type && data.attachment.sizes && data.attachment.sizes.medium ) { #>
-								<img class="attachment-thumb" src="{{ data.attachment.sizes.medium.url }}" draggable="false" alt="" />
-							<# } else if ( 'image' === data.attachment.type && data.attachment.sizes && data.attachment.sizes.full ) { #>
-								<img class="attachment-thumb" src="{{ data.attachment.sizes.full.url }}" draggable="false" alt="" />
-							<# } else if ( 'audio' === data.attachment.type ) { #>
-								<# if ( data.attachment.image && data.attachment.image.src && data.attachment.image.src !== data.attachment.icon ) { #>
-									<img src="{{ data.attachment.image.src }}" class="thumbnail" draggable="false" alt="" />
-								<# } else { #>
-									<img src="{{ data.attachment.icon }}" class="attachment-thumb type-icon" draggable="false" alt="" />
-								<# } #>
-								<p class="attachment-meta attachment-meta-title">&#8220;{{ data.attachment.title }}&#8221;</p>
-								<# if ( data.attachment.album || data.attachment.meta.album ) { #>
-								<p class="attachment-meta"><em>{{ data.attachment.album || data.attachment.meta.album }}</em></p>
-								<# } #>
-								<# if ( data.attachment.artist || data.attachment.meta.artist ) { #>
-								<p class="attachment-meta">{{ data.attachment.artist || data.attachment.meta.artist }}</p>
-								<# } #>
-								<audio style="visibility: hidden" controls class="wp-audio-shortcode" width="100%" preload="none">
-									<source type="{{ data.attachment.mime }}" src="{{ data.attachment.url }}"/>
-								</audio>
-							<# } else if ( 'video' === data.attachment.type ) { #>
-								<div class="wp-media-wrapper wp-video">
-									<video controls="controls" class="wp-video-shortcode" preload="metadata"
-										<# if ( data.attachment.image && data.attachment.image.src !== data.attachment.icon ) { #>poster="{{ data.attachment.image.src }}"<# } #>>
-										<source type="{{ data.attachment.mime }}" src="{{ data.attachment.url }}"/>
-									</video>
-								</div>
-							<# } else { #>
-								<img class="attachment-thumb type-icon icon" src="{{ data.attachment.icon }}" draggable="false" alt="" />
-								<p class="attachment-title">{{ data.attachment.title }}</p>
-							<# } #>
+			<div class="attachment-media-view attachment-media-view-{{ data.attachment.type }} {{ data.attachment.orientation }}">
+				<div class="thumbnail thumbnail-{{ data.attachment.type }}">
+					<# if ( 'image' === data.attachment.type && data.attachment.sizes && data.attachment.sizes.medium ) { #>
+						<img class="attachment-thumb" src="{{ data.attachment.sizes.medium.url }}" draggable="false" alt="" />
+					<# } else if ( 'image' === data.attachment.type && data.attachment.sizes && data.attachment.sizes.full ) { #>
+						<img class="attachment-thumb" src="{{ data.attachment.sizes.full.url }}" draggable="false" alt="" />
+					<# } else if ( 'audio' === data.attachment.type ) { #>
+						<# if ( data.attachment.image && data.attachment.image.src && data.attachment.image.src !== data.attachment.icon ) { #>
+							<img src="{{ data.attachment.image.src }}" class="thumbnail" draggable="false" alt="" />
+						<# } else { #>
+							<img src="{{ data.attachment.icon }}" class="attachment-thumb type-icon" draggable="false" alt="" />
+						<# } #>
+						<p class="attachment-meta attachment-meta-title">&#8220;{{ data.attachment.title }}&#8221;</p>
+						<# if ( data.attachment.album || data.attachment.meta.album ) { #>
+						<p class="attachment-meta"><em>{{ data.attachment.album || data.attachment.meta.album }}</em></p>
+						<# } #>
+						<# if ( data.attachment.artist || data.attachment.meta.artist ) { #>
+						<p class="attachment-meta">{{ data.attachment.artist || data.attachment.meta.artist }}</p>
+						<# } #>
+						<audio style="visibility: hidden" controls class="wp-audio-shortcode" width="100%" preload="none">
+							<source type="{{ data.attachment.mime }}" src="{{ data.attachment.url }}"/>
+						</audio>
+					<# } else if ( 'video' === data.attachment.type ) { #>
+						<div class="wp-media-wrapper wp-video">
+							<video controls="controls" class="wp-video-shortcode" preload="metadata"
+								<# if ( data.attachment.image && data.attachment.image.src !== data.attachment.icon ) { #>poster="{{ data.attachment.image.src }}"<# } #>>
+								<source type="{{ data.attachment.mime }}" src="{{ data.attachment.url }}"/>
+							</video>
 						</div>
-					</div>
+					<# } else { #>
+						<img class="attachment-thumb type-icon icon" src="{{ data.attachment.icon }}" draggable="false" alt="" />
+						<p class="attachment-title">{{ data.attachment.title }}</p>
+					<# } #>
+				</div>
+				<div class="actions">
+					<# if ( data.canUpload ) { #>
+					<button type="button" class="button remove-button">{{ data.button_labels.remove }}</button>
+					<button type="button" class="button upload-button control-focus" id="{{ data.settings['default'] }}-button">{{ data.button_labels.change }}</button>
+					<div style="clear:both"></div>
+					<# } #>
 				</div>
-			</div>
-			<div class="actions">
-				<# if ( data.canUpload ) { #>
-				<button type="button" class="button remove-button"><?php echo $this->button_labels['remove']; ?></button>
-				<button type="button" class="button upload-button" id="{{ data.settings['default'] }}-button"><?php echo $this->button_labels['change']; ?></button>
-				<div style="clear:both"></div>
-				<# } #>
 			</div>
 		<# } else { #>
-			<div class="current">
-				<div class="container">
-					<div class="placeholder">
-						<div class="inner">
-							<span>
-								<?php echo $this->button_labels['placeholder']; ?>
-							</span>
-						</div>
-					</div>
+			<div class="attachment-media-view">
+				<div class="placeholder">
+						{{ data.button_labels.placeholder }}
+				</div>
+				<div class="actions">
+					<# if ( data.defaultAttachment ) { #>
+						<button type="button" class="button default-button">{{ data.button_labels['default'] }}</button>
+					<# } #>
+					<# if ( data.canUpload ) { #>
+					<button type="button" class="button upload-button" id="{{ data.settings['default'] }}-button">{{ data.button_labels.select }}</button>
+					<# } #>
+					<div style="clear:both"></div>
 				</div>
-			</div>
-			<div class="actions">
-				<# if ( data.defaultAttachment ) { #>
-					<button type="button" class="button default-button"><?php echo $this->button_labels['default']; ?></button>
-				<# } #>
-				<# if ( data.canUpload ) { #>
-				<button type="button" class="button upload-button" id="{{ data.settings['default'] }}-button"><?php echo $this->button_labels['select']; ?></button>
-				<# } #>
-				<div style="clear:both"></div>
 			</div>
 		<# } #>
 		<?php