<!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>[22818] trunk/wp-includes: Media: Display WordPress and plupload error messages whenever an upload fails.</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/22818">22818</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-11-22 10:56:10 +0000 (Thu, 22 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: Display WordPress and plupload error messages whenever an upload fails. see <a href="http://core.trac.wordpress.org/ticket/22243">#22243</a>, <a href="http://core.trac.wordpress.org/ticket/22186">#22186</a>, <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 (22817 => 22818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/css/media-views.css 2012-11-22 09:52:16 UTC (rev 22817)
+++ trunk/wp-includes/css/media-views.css 2012-11-22 10:56:10 UTC (rev 22818)
</span><span class="lines">@@ -738,9 +738,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .media-uploader-status .media-progress-bar {
</span><ins>+ display: none;
</ins><span class="cx"> width: 100%;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.uploading.media-uploader-status .media-progress-bar {
+ display: block;
+}
+
</ins><span class="cx"> .attachment-preview .media-progress-bar {
</span><span class="cx"> position: absolute;
</span><span class="cx"> top: 50%;
</span><span class="lines">@@ -750,17 +755,23 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .media-uploader-status {
</span><ins>+ position: relative;
</ins><span class="cx"> padding-bottom: 10px;
</span><span class="cx"> border-bottom: 1px solid #dfdfdf;
</span><span class="cx"> box-shadow: 0 1px 0 #fff;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .media-uploader-status .upload-details {
</span><ins>+ display: none;
</ins><span class="cx"> font-size: 12px;
</span><span class="cx"> color: #666;
</span><span class="cx"> text-shadow: 0 1px 0 #fff;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.uploading.media-uploader-status .upload-details {
+ display: block;
+}
+
</ins><span class="cx"> .media-uploader-status .upload-detail-separator {
</span><span class="cx"> padding: 0 4px;
</span><span class="cx"> }
</span><span class="lines">@@ -769,6 +780,47 @@
</span><span class="cx"> color: #464646;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.media-uploader-status .upload-dismiss-errors,
+.media-uploader-status .upload-errors {
+ display: none;
+}
+
+.errors.media-uploader-status .upload-dismiss-errors,
+.errors.media-uploader-status .upload-errors {
+ display: block;
+}
+
+.media-uploader-status .upload-dismiss-errors {
+ position: absolute;
+ top: 0;
+ right: 0;
+ text-decoration: none;
+}
+
+.media-uploader-status .upload-error {
+ margin: 8px 0 0 0;
+ padding: 8px;
+ border: 1px #c00 solid;
+ background: #ffebe8;
+ border-radius: 3px;
+}
+
+.media-uploader-status .upload-error-label {
+ padding: 2px 4px;
+ margin-right: 8px;
+ font-weight: bold;
+ color: #fff;
+ background: #f00;
+ background: -webkit-linear-gradient( top, #e00, #a00 );
+ border-radius: 3px;
+}
+
+.media-uploader-status .upload-error-message {
+ display: block;
+ padding-top: 8px;
+ color: #b44;
+}
+
</ins><span class="cx"> .uploader-window {
</span><span class="cx"> position: fixed;
</span><span class="cx"> top: 0;
</span></span></pre></div>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (22817 => 22818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2012-11-22 09:52:16 UTC (rev 22817)
+++ trunk/wp-includes/js/media-views.js 2012-11-22 10:56:10 UTC (rev 22818)
</span><span class="lines">@@ -32,9 +32,11 @@
</span><span class="cx"> }());
</span><span class="cx">
</span><span class="cx"> // Makes it easier to bind events using transitions.
</span><del>- media.transition = function( selector ) {
</del><ins>+ media.transition = function( selector, sensitivity ) {
</ins><span class="cx"> var deferred = $.Deferred();
</span><span class="cx">
</span><ins>+ sensitivity = sensitivity || 2000;
+
</ins><span class="cx"> if ( $.support.transition ) {
</span><span class="cx"> if ( ! (selector instanceof $) )
</span><span class="cx"> selector = $( selector );
</span><span class="lines">@@ -42,6 +44,9 @@
</span><span class="cx"> // Resolve the deferred when the first element finishes animating.
</span><span class="cx"> selector.first().one( $.support.transition.end, deferred.resolve );
</span><span class="cx">
</span><ins>+ // Just in case the event doesn't trigger, fire a callback.
+ _.delay( deferred.resolve, sensitivity );
+
</ins><span class="cx"> // Otherwise, execute on the spot.
</span><span class="cx"> } else {
</span><span class="cx"> deferred.resolve();
</span><span class="lines">@@ -1835,6 +1840,10 @@
</span><span class="cx"> className: 'media-uploader-status',
</span><span class="cx"> template: media.template('uploader-status'),
</span><span class="cx">
</span><ins>+ events: {
+ 'click .upload-dismiss-errors': 'dismiss'
+ },
+
</ins><span class="cx"> initialize: function() {
</span><span class="cx"> this.controller = this.options.controller;
</span><span class="cx">
</span><span class="lines">@@ -1844,6 +1853,8 @@
</span><span class="cx"> this.queue.on( 'add remove reset change:uploading', this.info, this );
</span><span class="cx">
</span><span class="cx"> this.errors = wp.Uploader.errors;
</span><ins>+ this.errors.on( 'add remove reset', this.visibility, this );
+ this.errors.on( 'add', this.error, this );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> dispose: function() {
</span><span class="lines">@@ -1854,6 +1865,7 @@
</span><span class="cx">
</span><span class="cx"> visibility: function() {
</span><span class="cx"> this.$el.toggleClass( 'uploading', !! this.queue.length );
</span><ins>+ this.$el.toggleClass( 'errors', !! this.errors.length );
</ins><span class="cx"> this.$el.toggle( !! this.queue.length || !! this.errors.length );
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -1903,10 +1915,36 @@
</span><span class="cx">
</span><span class="cx"> this.$index.text( index + 1 );
</span><span class="cx"> this.$total.text( queue.length );
</span><del>- this.$filename.html( active ? media.truncate( _.escape( active.get('filename') ), 24 ) : '' );
</del><ins>+ this.$filename.html( active ? this.filename( active.get('filename') ) : '' );
+ },
+
+ filename: function( filename ) {
+ return media.truncate( _.escape( filename ), 24 );
+ },
+
+ error: function( error ) {
+ this.views.add( '.upload-errors', new media.view.UploaderStatusError({
+ filename: this.filename( error.get('file').name ),
+ message: error.get('message')
+ }), { at: 0 });
+ },
+
+ dismiss: function( event ) {
+ var errors = this.views.get('.upload-errors');
+
+ event.preventDefault();
+
+ if ( errors )
+ _.invoke( errors, 'remove' );
+ wp.Uploader.errors.reset();
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ media.view.UploaderStatusError = media.View.extend({
+ className: 'upload-error',
+ template: media.template('uploader-status-error')
+ });
+
</ins><span class="cx"> /**
</span><span class="cx"> * wp.media.view.Toolbar
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludesjspluploadwppluploadjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/plupload/wp-plupload.js (22817 => 22818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/plupload/wp-plupload.js 2012-11-22 09:52:16 UTC (rev 22817)
+++ trunk/wp-includes/js/plupload/wp-plupload.js 2012-11-22 10:56:10 UTC (rev 22818)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> file.attachment.destroy();
</span><span class="cx">
</span><span class="cx"> Uploader.errors.unshift({
</span><del>- message: message,
</del><ins>+ message: message || pluploadL10n.default_error,
</ins><span class="cx"> data: data,
</span><span class="cx"> file: file
</span><span class="cx"> });
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx"> if ( ! _.isObject( response ) || _.isUndefined( response.success ) )
</span><span class="cx"> return error( pluploadL10n.default_error, null, file );
</span><span class="cx"> else if ( ! response.success )
</span><del>- return error( response.data.message, response.data, file );
</del><ins>+ return error( response.data && response.data.message, response.data, file );
</ins><span class="cx">
</span><span class="cx"> _.each(['file','loaded','size','percent'], function( key ) {
</span><span class="cx"> file.attachment.unset( key );
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (22817 => 22818)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2012-11-22 09:52:16 UTC (rev 22817)
+++ trunk/wp-includes/media.php 2012-11-22 10:56:10 UTC (rev 22818)
</span><span class="lines">@@ -1503,6 +1503,8 @@
</span><span class="cx">
</span><span class="cx"> <script type="text/html" id="tmpl-uploader-status">
</span><span class="cx"> <h3><?php _e( 'Uploading' ); ?></h3>
</span><ins>+ <a class="upload-dismiss-errors" href="#"><?php _e('Dismiss Errors'); ?></a>
+
</ins><span class="cx"> <div class="media-progress-bar"><div></div></div>
</span><span class="cx"> <div class="upload-details">
</span><span class="cx"> <span class="upload-count">
</span><span class="lines">@@ -1515,6 +1517,12 @@
</span><span class="cx"> </div>
</span><span class="cx"> </script>
</span><span class="cx">
</span><ins>+ <script type="text/html" id="tmpl-uploader-status-error">
+ <span class="upload-error-label"><?php _e('Error'); ?></span>
+ <span class="upload-error-filename">{{{ data.filename }}}</span>
+ <span class="upload-error-message">{{ data.message }}</span>
+ </script>
+
</ins><span class="cx"> <script type="text/html" id="tmpl-attachment">
</span><span class="cx"> <div class="attachment-preview type-{{ data.type }} subtype-{{ data.subtype }} {{ data.orientation }}">
</span><span class="cx"> <# if ( data.uploading ) { #>
</span></span></pre>
</div>
</div>
</body>
</html>