<!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>[28030] trunk/src: Header Images: Add suggested dimensions to the media workflow.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28030">28030</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-04-08 01:54:44 +0000 (Tue, 08 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Header Images: Add suggested dimensions to the media workflow.
props ehg, gcorne.
see <a href="http://core.trac.wordpress.org/ticket/21785">#21785</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjscustomizecontrolsjs">trunk/src/wp-admin/js/customize-controls.js</a></li>
<li><a href="#trunksrcwpincludescssmediaviewscss">trunk/src/wp-includes/css/media-views.css</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</a></li>
<li><a href="#trunksrcwpincludesmediatemplatephp">trunk/src/wp-includes/media-template.php</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjscustomizecontrolsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/customize-controls.js (28029 => 28030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/customize-controls.js 2014-04-08 01:38:42 UTC (rev 28029)
+++ trunk/src/wp-admin/js/customize-controls.js 2014-04-08 01:54:44 UTC (rev 28030)
</span><span class="lines">@@ -419,16 +419,10 @@
</span><span class="cx"> * @param {event} event
</span><span class="cx"> */
</span><span class="cx"> openMedia: function(event) {
</span><del>- var suggestedWidth, suggestedHeight,
- l10n = _wpMediaViewsL10n;
</del><ins>+ var l10n = _wpMediaViewsL10n;
</ins><span class="cx">
</span><span class="cx"> event.preventDefault();
</span><span class="cx">
</span><del>- suggestedWidth = l10n.suggestedWidth.replace('%d', _wpCustomizeHeader.data.width);
- suggestedHeight = l10n.suggestedHeight.replace('%d', _wpCustomizeHeader.data.height);
-
- /* '<span class="suggested-dimensions">' + suggestedWidth + ' ' + suggestedHeight + '</span>' */
-
</del><span class="cx"> this.frame = wp.media({
</span><span class="cx"> title: l10n.chooseImage,
</span><span class="cx"> library: {
</span><span class="lines">@@ -439,7 +433,11 @@
</span><span class="cx"> close: false
</span><span class="cx"> },
</span><span class="cx"> multiple: false,
</span><del>- imgSelectOptions: this.calculateImageSelectOptions
</del><ins>+ crop: {
+ suggestedWidth: _wpCustomizeHeader.data.width,
+ suggestedHeight: _wpCustomizeHeader.data.height,
+ imgSelectOptions: this.calculateImageSelectOptions
+ }
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> this.frame.states.add([new wp.media.controller.Cropper()]);
</span></span></pre></div>
<a id="trunksrcwpincludescssmediaviewscss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/css/media-views.css (28029 => 28030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/css/media-views.css 2014-04-08 01:38:42 UTC (rev 28029)
+++ trunk/src/wp-includes/css/media-views.css 2014-04-08 01:54:44 UTC (rev 28030)
</span><span class="lines">@@ -929,6 +929,7 @@
</span><span class="cx"> line-height: 18px;
</span><span class="cx"> font-size: 13px;
</span><span class="cx"> color: #666;
</span><ins>+ margin-right: 0.5em;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (28029 => 28030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-04-08 01:38:42 UTC (rev 28029)
+++ trunk/src/wp-includes/js/media-views.js 2014-04-08 01:54:44 UTC (rev 28030)
</span><span class="lines">@@ -3312,6 +3312,16 @@
</span><span class="cx"> }) );
</span><span class="cx"> }
</span><span class="cx"> },
</span><ins>+
+ prepare: function() {
+ var cropOptions = this.controller.options.crop;
+ if ( cropOptions ) {
+ return {
+ suggestedWidth: cropOptions.suggestedWidth,
+ suggestedHeight: cropOptions.suggestedHeight
+ }
+ }
+ },
</ins><span class="cx"> /**
</span><span class="cx"> * @returns {wp.media.view.UploaderInline} Returns itself to allow chaining
</span><span class="cx"> */
</span><span class="lines">@@ -5154,7 +5164,8 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> createToolbar: function() {
</span><del>- var filters, FiltersConstructor;
</del><ins>+ var filters, FiltersConstructor,
+ frameOptions = this.controller.options;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @member {wp.media.view.Toolbar}
</span><span class="lines">@@ -5198,6 +5209,13 @@
</span><span class="cx"> priority: -40
</span><span class="cx"> }) );
</span><span class="cx"> }
</span><ins>+
+ if ( frameOptions.crop ) {
+ this.toolbar.set( 'suggestedDimensions', new media.View({
+ el: $( '<div class="instructions">' + l10n.suggestedDimensions + ' ' + frameOptions.crop.suggestedWidth + ' × ' + frameOptions.crop.suggestedHeight + '</div>' )[0],
+ priority: -40
+ }) );
+ }
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> updateContent: function() {
</span><span class="lines">@@ -6230,7 +6248,7 @@
</span><span class="cx"> };
</span><span class="cx"> },
</span><span class="cx"> onImageLoad: function() {
</span><del>- var imgOptions = this.controller.frame.options.imgSelectOptions;
</del><ins>+ var imgOptions = this.controller.frame.options.crop.imgSelectOptions;
</ins><span class="cx"> if (typeof imgOptions === 'function') {
</span><span class="cx"> imgOptions = imgOptions(this.options.attachment, this.controller);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media-template.php (28029 => 28030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media-template.php 2014-04-08 01:38:42 UTC (rev 28029)
+++ trunk/src/wp-includes/media-template.php 2014-04-08 01:54:44 UTC (rev 28030)
</span><span class="lines">@@ -205,6 +205,12 @@
</span><span class="cx"> printf( __( 'Maximum upload file size: %d%s.' ), esc_html($upload_size_unit), esc_html($byte_sizes[$u]) );
</span><span class="cx"> ?></p>
</span><span class="cx">
</span><ins>+ <# if ( data.suggestedWidth && data.suggestedHeight ) { #>
+ <p class="suggested-dimensions">
+ <?php _e( 'Suggested image dimensions:' ); ?> {{{data.suggestedWidth}}} × {{{data.suggestedHeight}}}
+ </p>
+ <# } #>
+
</ins><span class="cx"> <?php
</span><span class="cx"> /** This action is documented in wp-admin/includes/media.php */
</span><span class="cx"> do_action( 'post-upload-ui' ); ?>
</span></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media.php (28029 => 28030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media.php 2014-04-08 01:38:42 UTC (rev 28029)
+++ trunk/src/wp-includes/media.php 2014-04-08 01:54:44 UTC (rev 28030)
</span><span class="lines">@@ -2525,8 +2525,7 @@
</span><span class="cx"> 'cropImage' => __( 'Crop Image' ),
</span><span class="cx"> 'cropYourImage' => __( 'Crop your image' ),
</span><span class="cx"> 'cropping' => __( 'Cropping…' ),
</span><del>- 'suggestedWidth' => __( 'Suggested width is %d pixels.' ),
- 'suggestedHeight' => __( 'Suggested height is %d pixels.' ),
</del><ins>+ 'suggestedDimensions' => __( 'Suggested image dimensions:' ),
</ins><span class="cx"> 'cropError' => __( 'There has been an error cropping your image.' ),
</span><span class="cx">
</span><span class="cx"> // Edit Audio
</span></span></pre>
</div>
</div>
</body>
</html>