<!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>[29532] trunk/src/wp-includes: Media Modal: Restore to the previous filter and search error message.</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/29532">29532</a></dd>
<dt>Author</dt> <dd>ocean90</dd>
<dt>Date</dt> <dd>2014-08-18 16:27:33 +0000 (Mon, 18 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media Modal: Restore to the previous filter and search error message.
fixes <a href="http://core.trac.wordpress.org/ticket/28963">#28963</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescssmediaviewscss">trunk/src/wp-includes/css/media-views.css</a></li>
<li><a href="#trunksrcwpincludesjsmediagridjs">trunk/src/wp-includes/js/media-grid.js</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 (29531 => 29532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/css/media-views.css 2014-08-18 04:07:03 UTC (rev 29531)
+++ trunk/src/wp-includes/css/media-views.css 2014-08-18 16:27:33 UTC (rev 29532)
</span><span class="lines">@@ -259,7 +259,8 @@
</span><span class="cx"> bottom: auto;
</span><span class="cx"> border-left: none;
</span><span class="cx"> padding: 16px;
</span><del>- box-shadow: -1px 0px 1px rgba(0,0,0,.3);
</del><ins>+ -webkit-box-shadow: -1px 0 1px rgba(0,0,0,.3);
+ box-shadow: -1px 0 1px rgba(0,0,0,.3);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .upload-php .mode-grid .media-sidebar .media-uploader-status {
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediagridjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-grid.js (29531 => 29532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-grid.js 2014-08-18 04:07:03 UTC (rev 29531)
+++ trunk/src/wp-includes/js/media-grid.js 2014-08-18 16:27:33 UTC (rev 29532)
</span><span class="lines">@@ -226,11 +226,7 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> sidebarVisibility: function() {
</span><del>- if ( this.errors.length ) {
- this.browserView.$( '.media-sidebar' ).show();
- } else {
- this.browserView.$( '.media-sidebar' ).hide();
- }
</del><ins>+ this.browserView.$( '.media-sidebar' ).toggle( !! this.errors.length );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> bindDeferred: function() {
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (29531 => 29532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-08-18 04:07:03 UTC (rev 29531)
+++ trunk/src/wp-includes/js/media-views.js 2014-08-18 16:27:33 UTC (rev 29532)
</span><span class="lines">@@ -5979,7 +5979,7 @@
</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: this.controller.isModeActive( 'grid' ) ? '' : l10n.noItemsFound,
</ins><span class="cx"> canClose: this.controller.isModeActive( 'grid' )
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -6011,15 +6011,18 @@
</span><span class="cx">
</span><span class="cx"> this.views.add( this.attachments );
</span><span class="cx">
</span><del>- this.attachmentsNoResults = new media.View({
- controller: this.controller,
- tagName: 'p'
- });
</del><span class="cx">
</span><del>- this.attachmentsNoResults.$el.addClass( 'hidden no-media' );
- this.attachmentsNoResults.$el.html( l10n.noMedia );
</del><ins>+ if ( this.controller.isModeActive( 'grid' ) ) {
+ this.attachmentsNoResults = new media.View({
+ controller: this.controller,
+ tagName: 'p'
+ });
</ins><span class="cx">
</span><del>- this.views.add( this.attachmentsNoResults );
</del><ins>+ this.attachmentsNoResults.$el.addClass( 'hidden no-media' );
+ this.attachmentsNoResults.$el.html( l10n.noMedia );
+
+ this.views.add( this.attachmentsNoResults );
+ }
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> createSidebar: function() {
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media-template.php (29531 => 29532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media-template.php 2014-08-18 04:07:03 UTC (rev 29531)
+++ trunk/src/wp-includes/media-template.php 2014-08-18 16:27:33 UTC (rev 29532)
</span><span class="lines">@@ -185,9 +185,9 @@
</span><span class="cx">
</span><span class="cx"> <?php else : ?>
</span><span class="cx"> <div class="upload-ui">
</span><del>- <h3 class="upload-instructions drop-instructions"><?php _e( 'Drop files here' ); ?></h3>
</del><ins>+ <h3 class="upload-instructions drop-instructions"><?php _e( 'Drop files anywhere to upload' ); ?></h3>
</ins><span class="cx"> <p class="upload-instructions drop-instructions"><?php _ex( 'or', 'Uploader: Drop files here - or - Select Files' ); ?></p>
</span><del>- <a href="#" class="browser button"><?php _e( 'Select Files' ); ?></a>
</del><ins>+ <a href="#" class="browser button button-hero"><?php _e( 'Select Files' ); ?></a>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="upload-inline-status"></div>
</span></span></pre>
</div>
</div>
</body>
</html>