sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Media Modal: Restore to the previous filter and search error message. 

fixes #28963.

git-svn-id: https://develop.svn.wordpress.org/trunk@29532 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dominik Schilling (ocean90) 2014-08-18 16:27:33 +00:00
parent 75f20c3e69
commit 7cbb35a84e
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/wp-includes/css/media-views.css
View File

@ -259,7 +259,8 @@
bottom: auto;
border-left: none;
padding: 16px;
box-shadow: -1px 0px 1px rgba(0,0,0,.3);
-webkit-box-shadow: -1px 0 1px rgba(0,0,0,.3);
box-shadow: -1px 0 1px rgba(0,0,0,.3);
}
.upload-php .mode-grid .media-sidebar .media-uploader-status {

6
src/wp-includes/js/media-grid.js
View File

@ -226,11 +226,7 @@
},
sidebarVisibility: function() {
if ( this.errors.length ) {
this.browserView.$( '.media-sidebar' ).show();
} else {
this.browserView.$( '.media-sidebar' ).hide();
}
this.browserView.$( '.media-sidebar' ).toggle( !! this.errors.length );
},
bindDeferred: function() {

19
src/wp-includes/js/media-views.js
View File

@ -5979,7 +5979,7 @@
this.uploader = new media.view.UploaderInline({
controller: this.controller,
status: false,
message: l10n.noItemsFound,
message: this.controller.isModeActive( 'grid' ) ? '' : l10n.noItemsFound,
canClose: this.controller.isModeActive( 'grid' )
});
@ -6011,15 +6011,18 @@
this.views.add( this.attachments );
this.attachmentsNoResults = new media.View({
controller: this.controller,
tagName: 'p'
});
this.attachmentsNoResults.$el.addClass( 'hidden no-media' );
this.attachmentsNoResults.$el.html( l10n.noMedia );
if ( this.controller.isModeActive( 'grid' ) ) {
this.attachmentsNoResults = new media.View({
controller: this.controller,
tagName: 'p'
});
this.views.add( this.attachmentsNoResults );
this.attachmentsNoResults.$el.addClass( 'hidden no-media' );
this.attachmentsNoResults.$el.html( l10n.noMedia );
this.views.add( this.attachmentsNoResults );
}
},
createSidebar: function() {

4
src/wp-includes/media-template.php
View File

@ -185,9 +185,9 @@ function wp_print_media_templates() {
<?php else : ?>
<div class="upload-ui">
<h3 class="upload-instructions drop-instructions"><?php _e( 'Drop files here' ); ?></h3>
<h3 class="upload-instructions drop-instructions"><?php _e( 'Drop files anywhere to upload' ); ?></h3>
<p class="upload-instructions drop-instructions"><?php _ex( 'or', 'Uploader: Drop files here - or - Select Files' ); ?></p>
<a href="#" class="browser button"><?php _e( 'Select Files' ); ?></a>
<a href="#" class="browser button button-hero"><?php _e( 'Select Files' ); ?></a>
</div>
<div class="upload-inline-status"></div>