<!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>[21724] branches/3.4: Remove custom header uploads from the customizer.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/21724">21724</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-09-04 04:54:01 +0000 (Tue, 04 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove custom header uploads from the customizer.
For the 3.4 branch. It will return when crop ability is added.
props koopersmith.
see <a href="http://core.trac.wordpress.org/ticket/21355">#21355</a>. fixes <a href="http://core.trac.wordpress.org/ticket/21515">#21515</a>. fixes <a href="http://core.trac.wordpress.org/ticket/21707">#21707</a>.
merges <a href="http://core.trac.wordpress.org/changeset/21379">[21379]</a> <a href="http://core.trac.wordpress.org/changeset/21380">[21380]</a> <a href="http://core.trac.wordpress.org/changeset/21383">[21383]</a> <a href="http://core.trac.wordpress.org/changeset/21385">[21385]</a> <a href="http://core.trac.wordpress.org/changeset/21386">[21386]</a> <a href="http://core.trac.wordpress.org/changeset/21497">[21497]</a> <a href="http://core.trac.wordpress.org/changeset/21722">[21722]</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches34wpadminjscustomizecontrolsdevjs">branches/3.4/wp-admin/js/customize-controls.dev.js</a></li>
<li><a href="#branches34wpincludesclasswpcustomizecontrolphp">branches/3.4/wp-includes/class-wp-customize-control.php</a></li>
<li><a href="#branches34wpincludesjspluploadwppluploaddevjs">branches/3.4/wp-includes/js/plupload/wp-plupload.dev.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches34wpadminjscustomizecontrolsdevjs"></a>
<div class="modfile"><h4>Modified: branches/3.4/wp-admin/js/customize-controls.dev.js (21723 => 21724)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.4/wp-admin/js/customize-controls.dev.js 2012-09-04 04:17:49 UTC (rev 21723)
+++ branches/3.4/wp-admin/js/customize-controls.dev.js 2012-09-04 04:54:01 UTC (rev 21724)
</span><span class="lines">@@ -220,10 +220,6 @@
</span><span class="cx"> };
</span><span class="cx"> });
</span><span class="cx">
</span><del>- // Select a tab
- this.selected = this.tabs[ panels.first().data('customizeTab') ];
- this.selected.both.addClass('library-selected');
-
</del><span class="cx"> // Bind tab switch events
</span><span class="cx"> this.library.children('ul').on( 'click', 'li', function( event ) {
</span><span class="cx"> var id = $(this).data('customizeTab'),
</span><span class="lines">@@ -255,6 +251,18 @@
</span><span class="cx"> this.tabs.uploaded.both.addClass('hidden');
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Select a tab
+ panels.each( function() {
+ var tab = control.tabs[ $(this).data('customizeTab') ];
+
+ // Select the first visible tab.
+ if ( ! tab.link.hasClass('hidden') ) {
+ control.selected = tab;
+ tab.both.addClass('library-selected');
+ return false;
+ }
+ });
+
</ins><span class="cx"> this.dropdownInit();
</span><span class="cx"> },
</span><span class="cx"> success: function( attachment ) {
</span></span></pre></div>
<a id="branches34wpincludesclasswpcustomizecontrolphp"></a>
<div class="modfile"><h4>Modified: branches/3.4/wp-includes/class-wp-customize-control.php (21723 => 21724)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.4/wp-includes/class-wp-customize-control.php 2012-09-04 04:17:49 UTC (rev 21723)
+++ branches/3.4/wp-includes/class-wp-customize-control.php 2012-09-04 04:54:01 UTC (rev 21724)
</span><span class="lines">@@ -321,8 +321,23 @@
</span><span class="cx">
</span><span class="cx"> $this->add_tab( 'upload-new', __('Upload New'), array( $this, 'tab_upload_new' ) );
</span><span class="cx"> $this->add_tab( 'uploaded', __('Uploaded'), array( $this, 'tab_uploaded' ) );
</span><ins>+
+ // Early priority to occur before $this->manager->prepare_controls();
+ add_action( 'customize_controls_init', array( $this, 'prepare_control' ), 5 );
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ /**
+ * Prepares the control.
+ *
+ * If no tabs exist, removes the control from the manager.
+ *
+ * @since 3.4.2
+ */
+ public function prepare_control() {
+ if ( ! $this->tabs )
+ $this->manager->remove_control( $this->id );
+ }
+
</ins><span class="cx"> public function to_json() {
</span><span class="cx"> parent::to_json();
</span><span class="cx"> $this->json['statuses'] = $this->statuses;
</span><span class="lines">@@ -455,6 +470,20 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
</span><ins>+ /**
+ * The processed default headers.
+ * @since 3.4.2
+ * @var array
+ */
+ protected $default_headers;
+
+ /**
+ * The uploaded headers.
+ * @since 3.4.2
+ * @var array
+ */
+ protected $uploaded_headers;
+
</ins><span class="cx"> public function __construct( $manager ) {
</span><span class="cx"> parent::__construct( $manager, 'header_image', array(
</span><span class="cx"> 'label' => __( 'Header Image' ),
</span><span class="lines">@@ -474,9 +503,36 @@
</span><span class="cx"> )
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- $this->add_tab( 'default', __('Default'), array( $this, 'tab_default_headers' ) );
</del><ins>+ // Remove the upload tab.
+ $this->remove_tab( 'upload-new' );
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ /**
+ * Prepares the control.
+ *
+ * If no tabs exist, removes the control from the manager.
+ *
+ * @since 3.4.2
+ */
+ public function prepare_control() {
+ global $custom_image_header;
+ if ( empty( $custom_image_header ) )
+ return parent::prepare_control();
+
+ // Process default headers and uploaded headers.
+ $custom_image_header->process_default_headers();
+ $this->default_headers = $custom_image_header->default_headers;
+ $this->uploaded_headers = get_uploaded_header_images();
+
+ if ( $this->default_headers )
+ $this->add_tab( 'default', __('Default'), array( $this, 'tab_default_headers' ) );
+
+ if ( ! $this->uploaded_headers )
+ $this->remove_tab( 'uploaded' );
+
+ return parent::prepare_control();
+ }
+
</ins><span class="cx"> public function print_header_image( $choice, $header ) {
</span><span class="cx"> $header['url'] = set_url_scheme( $header['url'] );
</span><span class="cx"> $header['thumbnail_url'] = set_url_scheme( $header['thumbnail_url'] );
</span><span class="lines">@@ -498,19 +554,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> public function tab_uploaded() {
</span><del>- $headers = get_uploaded_header_images();
-
</del><span class="cx"> ?><div class="uploaded-target"></div><?php
</span><span class="cx">
</span><del>- foreach ( $headers as $choice => $header )
</del><ins>+ foreach ( $this->uploaded_headers as $choice => $header )
</ins><span class="cx"> $this->print_header_image( $choice, $header );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> public function tab_default_headers() {
</span><del>- global $custom_image_header;
- $custom_image_header->process_default_headers();
-
- foreach ( $custom_image_header->default_headers as $choice => $header )
</del><ins>+ foreach ( $this->default_headers as $choice => $header )
</ins><span class="cx"> $this->print_header_image( $choice, $header );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branches34wpincludesjspluploadwppluploaddevjs"></a>
<div class="modfile"><h4>Modified: branches/3.4/wp-includes/js/plupload/wp-plupload.dev.js (21723 => 21724)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.4/wp-includes/js/plupload/wp-plupload.dev.js 2012-09-04 04:17:49 UTC (rev 21723)
+++ branches/3.4/wp-includes/js/plupload/wp-plupload.dev.js 2012-09-04 04:54:01 UTC (rev 21724)
</span><span class="lines">@@ -73,6 +73,10 @@
</span><span class="cx"> this.plupload[ elements[ key ] ] = this[ key ].prop('id');
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // If the uploader has neither a browse button nor a dropzone, bail.
+ if ( ! ( this.browser && this.browser.length ) && ! ( this.dropzone && this.dropzone.length ) )
+ return;
+
</ins><span class="cx"> this.uploader = new plupload.Uploader( this.plupload );
</span><span class="cx"> delete this.plupload;
</span><span class="cx">
</span><span class="lines">@@ -113,7 +117,13 @@
</span><span class="cx"> });
</span><span class="cx"> }( this.dropzone, this.supports.dragdrop ));
</span><span class="cx">
</span><del>- this.browser.on( 'mouseenter', this.refresh );
</del><ins>+ if ( this.browser ) {
+ 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();
+ }
</ins><span class="cx">
</span><span class="cx"> this.uploader.bind( 'UploadProgress', this.progress );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>