<!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>[22505] trunk/wp-admin: Integrate media with the custom header page.</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/22505">22505</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-11-09 11:59:05 +0000 (Fri, 09 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Integrate media with the custom header page. fixes <a href="http://core.trac.wordpress.org/ticket/21820">#21820</a>, see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincustomheaderphp">trunk/wp-admin/custom-header.php</a></li>
<li><a href="#trunkwpadminjscustomheaderjs">trunk/wp-admin/js/custom-header.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincustomheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-header.php (22504 => 22505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-header.php 2012-11-09 11:55:20 UTC (rev 22504)
+++ trunk/wp-admin/custom-header.php 2012-11-09 11:59:05 UTC (rev 22505)
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx">
</span><span class="cx"> if ( ( 1 == $step || 3 == $step ) ) {
</span><span class="cx"> add_thickbox();
</span><del>- wp_enqueue_script( 'media-upload' );
</del><ins>+ wp_enqueue_media();
</ins><span class="cx"> wp_enqueue_script( 'custom-header' );
</span><span class="cx"> if ( current_theme_supports( 'custom-header', 'header-text' ) )
</span><span class="cx"> wp_enqueue_script( 'wp-color-picker' );
</span><span class="lines">@@ -534,13 +534,18 @@
</span><span class="cx"> <?php submit_button( __( 'Upload' ), 'button', 'submit', false ); ?>
</span><span class="cx"> </p>
</span><span class="cx"> <?php
</span><del>- $image_library_url = get_upload_iframe_src( 'image', null, 'library' );
- $image_library_url = remove_query_arg( 'TB_iframe', $image_library_url );
- $image_library_url = add_query_arg( array( 'context' => 'custom-header', 'TB_iframe' => 1 ), $image_library_url );
</del><ins>+ $modal_update_href = esc_url( add_query_arg( array(
+ 'page' => 'custom-header',
+ 'step' => 2,
+ '_wpnonce-custom-header-upload' => wp_create_nonce('custom-header-upload'),
+ ), admin_url('themes.php') ) );
</ins><span class="cx"> ?>
</span><span class="cx"> <p>
</span><span class="cx"> <label for="choose-from-library-link"><?php _e( 'Or choose an image from your media library:' ); ?></label><br />
</span><del>- <a id="choose-from-library-link" class="button thickbox" href="<?php echo esc_url( $image_library_url ); ?>"><?php _e( 'Choose Image' ); ?></a>
</del><ins>+ <a id="choose-from-library-link" class="button"
+ data-update-link="<?php echo esc_attr( $modal_update_href ); ?>"
+ data-choose="<?php esc_attr_e( 'Choose a Custom Header' ); ?>"
+ data-update="<?php esc_attr_e( 'Set as header' ); ?>"><?php _e( 'Choose Image' ); ?></a>
</ins><span class="cx"> </p>
</span><span class="cx"> </form>
</span><span class="cx"> </td>
</span><span class="lines">@@ -746,7 +751,7 @@
</span><span class="cx"> <p class="submit">
</span><span class="cx"> <?php submit_button( __( 'Crop and Publish' ), 'primary', 'submit', false ); ?>
</span><span class="cx"> <?php
</span><del>- if ( isset( $oitar ) && 1 == $oitar && ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) )
</del><ins>+ if ( isset( $oitar ) && 1 == $oitar && ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) )
</ins><span class="cx"> submit_button( __( 'Skip Cropping, Publish Image as Is' ), 'secondary', 'skip-cropping', false );
</span><span class="cx"> ?>
</span><span class="cx"> </p>
</span><span class="lines">@@ -800,7 +805,7 @@
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $_POST['skip-cropping'] ) && ! ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) )
</span><span class="cx"> wp_die( __( 'Cheatin&#8217; uh?' ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $_POST['oitar'] > 1 ) {
</span><span class="cx"> $_POST['x1'] = $_POST['x1'] * $_POST['oitar'];
</span><span class="cx"> $_POST['y1'] = $_POST['y1'] * $_POST['oitar'];
</span></span></pre></div>
<a id="trunkwpadminjscustomheaderjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/custom-header.js (22504 => 22505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/custom-header.js 2012-11-09 11:55:20 UTC (rev 22504)
+++ trunk/wp-admin/js/custom-header.js 2012-11-09 11:59:05 UTC (rev 22505)
</span><span class="lines">@@ -1,7 +1,9 @@
</span><span class="cx"> (function($) {
</span><del>- // Fetch available headers and apply jQuery.masonry
- // once the images have loaded.
</del><ins>+ var frame;
+
</ins><span class="cx"> $( function() {
</span><ins>+ // Fetch available headers and apply jQuery.masonry
+ // once the images have loaded.
</ins><span class="cx"> var $headers = $('.available-headers');
</span><span class="cx">
</span><span class="cx"> $headers.imagesLoaded( function() {
</span><span class="lines">@@ -9,5 +11,36 @@
</span><span class="cx"> itemSelector: '.default-header'
</span><span class="cx"> });
</span><span class="cx"> });
</span><ins>+
+ // Build the choose from library frame.
+ $('#choose-from-library-link').click( function( event ) {
+ var $el = $(this);
+ event.preventDefault();
+
+ frame = wp.media({
+ title: $el.data('choose'),
+ library: {
+ type: 'image'
+ }
+ });
+
+ frame.toolbar.on( 'activate:select', function() {
+ frame.toolbar.view().add({
+ select: {
+ style: 'primary',
+ text: $el.data('update'),
+
+ click: function() {
+ var attachment = frame.state().get('selection').first(),
+ link = $el.data('updateLink');
+
+ window.location = link + '&file=' + attachment.id;
+ }
+ }
+ });
+ });
+
+ frame.state('library');
+ });
</ins><span class="cx"> });
</span><span class="cx"> }(jQuery));
</span></span></pre>
</div>
</div>
</body>
</html>