<!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>[29082] trunk/src/wp-includes: Media Grid: make the Uploader closable.</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/29082">29082</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-07-10 23:05:05 +0000 (Thu, 10 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media Grid: make the Uploader closable.
Props ericlewis.
See <a href="http://core.trac.wordpress.org/ticket/24716">#24716</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescssmediaviewscss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/css/media-views.css (29081 => 29082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/css/media-views.css 2014-07-10 23:02:51 UTC (rev 29081)
+++ trunk/src/wp-includes/css/media-views.css 2014-07-10 23:05:05 UTC (rev 29082)
</span><span class="lines">@@ -1020,6 +1020,27 @@
</span><span class="cx"> top: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.uploader-inline .close {
+ background-color: transparent;
+ border: 0;
+ cursor: pointer;
+ height: 48px;
+ position: absolute;
+ right: 20px;
+ text-align: center;
+ top: 20px;
+ width: 50px;
+ z-index: 1;
+}
+
+.uploader-inline .close:before {
+ font: normal 30px/50px 'dashicons' !important;
+ color: #777;
+ display: inline-block;
+ content: '\f335';
+ font-weight: 300;
+}
+
</ins><span class="cx"> .inline-toolbar {
</span><span class="cx"> position: absolute;
</span><span class="cx"> top: 0;
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (29081 => 29082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-07-10 23:02:51 UTC (rev 29081)
+++ trunk/src/wp-includes/js/media-views.js 2014-07-10 23:05:05 UTC (rev 29082)
</span><span class="lines">@@ -3654,10 +3654,15 @@
</span><span class="cx"> className: 'uploader-inline',
</span><span class="cx"> template: media.template('uploader-inline'),
</span><span class="cx">
</span><ins>+ events: {
+ 'click .close': 'hide'
+ },
+
</ins><span class="cx"> initialize: function() {
</span><span class="cx"> _.defaults( this.options, {
</span><span class="cx"> message: '',
</span><del>- status: true
</del><ins>+ status: true,
+ canClose: false
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> if ( ! this.options.$browser && this.controller.uploader ) {
</span><span class="lines">@@ -3677,14 +3682,16 @@
</span><span class="cx">
</span><span class="cx"> prepare: function() {
</span><span class="cx"> var suggestedWidth = this.controller.state().get('suggestedWidth'),
</span><del>- suggestedHeight = this.controller.state().get('suggestedHeight');
</del><ins>+ suggestedHeight = this.controller.state().get('suggestedHeight'),
+ data = {};
</ins><span class="cx">
</span><ins>+ data.canClose = this.options.canClose;
+
</ins><span class="cx"> if ( suggestedWidth && suggestedHeight ) {
</span><del>- return {
- suggestedWidth: suggestedWidth,
- suggestedHeight: suggestedHeight
- };
</del><ins>+ data.suggestedWidth = suggestedWidth;
+ data.suggestedHeight = suggestedHeight;
</ins><span class="cx"> }
</span><ins>+ return data;
</ins><span class="cx"> },
</span><span class="cx"> /**
</span><span class="cx"> * @returns {wp.media.view.UploaderInline} Returns itself to allow chaining
</span><span class="lines">@@ -3745,7 +3752,14 @@
</span><span class="cx">
</span><span class="cx"> this.refresh();
</span><span class="cx"> return this;
</span><ins>+ },
+ show: function() {
+ this.$el.removeClass( 'hidden' );
+ },
+ hide: function() {
+ this.$el.addClass( 'hidden' );
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -5722,7 +5736,8 @@
</span><span class="cx"> this.uploader = new media.view.UploaderInline({
</span><span class="cx"> controller: this.controller,
</span><span class="cx"> status: false,
</span><del>- message: l10n.noItemsFound
</del><ins>+ message: l10n.noItemsFound,
+ canClose: this.controller.isModeActive( 'grid' )
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> this.uploader.$el.addClass( 'hidden' );
</span><span class="lines">@@ -5730,7 +5745,7 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> showUploader: function() {
</span><del>- this.uploader.$el.removeClass( 'hidden' );
</del><ins>+ this.uploader.show();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> createAttachments: function() {
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media-template.php (29081 => 29082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media-template.php 2014-07-10 23:02:51 UTC (rev 29081)
+++ trunk/src/wp-includes/media-template.php 2014-07-10 23:05:05 UTC (rev 29082)
</span><span class="lines">@@ -160,6 +160,9 @@
</span><span class="cx">
</span><span class="cx"> <script type="text/html" id="tmpl-uploader-inline">
</span><span class="cx"> <# var messageClass = data.message ? 'has-upload-message' : 'no-upload-message'; #>
</span><ins>+ <# if ( data.canClose ) { #>
+ <button class="close dashicons dashicons-no"><span class="screen-reader-text">Close overlay</span></button>
+ <# } #>
</ins><span class="cx"> <div class="uploader-inline-content {{ messageClass }}">
</span><span class="cx"> <# if ( data.message ) { #>
</span><span class="cx"> <h3 class="upload-message">{{ data.message }}</h3>
</span></span></pre>
</div>
</div>
</body>
</html>