<!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>[22543] trunk/wp-includes: Media: Ensure variables in the attachment details template have defined defaults.</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/22543">22543</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-11-11 05:16:41 +0000 (Sun, 11 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: Ensure variables in the attachment details template have defined defaults.
* Adds styling to the upload progress bar in the attachment details template.
* Defines the `filename` attribute when Plupload creates the client-side `Attachment` model.
fixes <a href="http://core.trac.wordpress.org/ticket/22410">#22410</a>, see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescssmediaviewscss">trunk/wp-includes/css/media-views.css</a></li>
<li><a href="#trunkwpincludesjsmediaviewsjs">trunk/wp-includes/js/media-views.js</a></li>
<li><a href="#trunkwpincludesjspluploadwppluploadjs">trunk/wp-includes/js/plupload/wp-plupload.js</a></li>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescssmediaviewscss"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/css/media-views.css (22542 => 22543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/media-views.css 2012-11-11 01:40:47 UTC (rev 22542)
+++ trunk/wp-includes/css/media-views.css 2012-11-11 05:16:41 UTC (rev 22543)
</span><span class="lines">@@ -933,6 +933,16 @@
</span><span class="cx"> margin-bottom: 5px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.uploading .attachment-info .thumbnail {
+ width: 120px;
+ height: 80px;
+ box-shadow: inset 0 0 15px rgba( 0, 0, 0, 0.1 );
+}
+
+.uploading .attachment-info .media-progress-bar {
+ margin-top: 32px;
+}
+
</ins><span class="cx"> .attachment-info .thumbnail:after {
</span><span class="cx"> content: '';
</span><span class="cx"> display: block;
</span></span></pre></div>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (22542 => 22543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-11-11 01:40:47 UTC (rev 22542)
+++ trunk/wp-includes/js/media-views.js 2012-11-11 05:16:41 UTC (rev 22543)
</span><span class="lines">@@ -1954,14 +1954,19 @@
</span><span class="cx"> render: function() {
</span><span class="cx"> var attachment = this.model.toJSON(),
</span><span class="cx"> options = _.defaults( this.model.toJSON(), {
</span><del>- orientation: 'landscape',
- uploading: false,
- type: '',
- subtype: '',
- icon: '',
- filename: '',
- caption: '',
- title: ''
</del><ins>+ orientation: 'landscape',
+ uploading: false,
+ type: '',
+ subtype: '',
+ icon: '',
+ filename: '',
+ caption: '',
+ title: '',
+ dateFormatted: '',
+ width: '',
+ height: '',
+ compat: false,
+ alt: ''
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> options.buttons = this.buttons;
</span><span class="lines">@@ -1972,6 +1977,7 @@
</span><span class="cx">
</span><span class="cx"> this.$el.html( this.template( options ) );
</span><span class="cx">
</span><ins>+ this.$el.toggleClass( 'uploading', options.uploading );
</ins><span class="cx"> if ( options.uploading )
</span><span class="cx"> this.$bar = this.$('.media-progress-bar div');
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkwpincludesjspluploadwppluploadjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/plupload/wp-plupload.js (22542 => 22543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/plupload/wp-plupload.js 2012-11-11 01:40:47 UTC (rev 22542)
+++ trunk/wp-includes/js/plupload/wp-plupload.js 2012-11-11 05:16:41 UTC (rev 22543)
</span><span class="lines">@@ -147,7 +147,8 @@
</span><span class="cx"> attributes = _.extend({
</span><span class="cx"> file: file,
</span><span class="cx"> uploading: true,
</span><del>- date: new Date()
</del><ins>+ date: new Date(),
+ filename: file.name
</ins><span class="cx"> }, _.pick( file, 'loaded', 'size', 'percent' ) );
</span><span class="cx">
</span><span class="cx"> // Handle early mime type scanning for images.
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (22542 => 22543)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2012-11-11 01:40:47 UTC (rev 22542)
+++ trunk/wp-includes/media.php 2012-11-11 05:16:41 UTC (rev 22543)
</span><span class="lines">@@ -1454,7 +1454,7 @@
</span><span class="cx"> <div class="details">
</span><span class="cx"> <div class="filename">{{ filename }}</div>
</span><span class="cx"> <div class="uploaded">{{ dateFormatted }}</div>
</span><del>- <# if ( 'image' === type ) { #>
</del><ins>+ <# if ( 'image' === type && ! uploading ) { #>
</ins><span class="cx"> <div class="dimensions">{{ width }} &times; {{ height }}</div>
</span><span class="cx"> <# } #>
</span><span class="cx"> </div>
</span></span></pre>
</div>
</div>
</body>
</html>