WordPress.org

Make WordPress Core

Changeset 29532


Ignore:
Timestamp:
08/18/2014 04:27:33 PM (6 years ago)
Author:
ocean90
Message:

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

fixes #28963.

Location:
trunk/src/wp-includes
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/css/media-views.css

    r29527 r29532  
    260260    border-left: none;
    261261    padding: 16px;
    262     box-shadow: -1px 0px 1px rgba(0,0,0,.3);
     262    -webkit-box-shadow: -1px 0 1px rgba(0,0,0,.3);
     263    box-shadow: -1px 0 1px rgba(0,0,0,.3);
    263264}
    264265
  • trunk/src/wp-includes/js/media-grid.js

    r29526 r29532  
    227227
    228228        sidebarVisibility: function() {
    229             if ( this.errors.length ) {
    230                 this.browserView.$( '.media-sidebar' ).show();
    231             } else {
    232                 this.browserView.$( '.media-sidebar' ).hide();
    233             }
     229            this.browserView.$( '.media-sidebar' ).toggle( !! this.errors.length );
    234230        },
    235231
  • trunk/src/wp-includes/js/media-views.js

    r29527 r29532  
    59805980                controller: this.controller,
    59815981                status:     false,
    5982                 message:    l10n.noItemsFound,
     5982                message:    this.controller.isModeActive( 'grid' ) ? '' : l10n.noItemsFound,
    59835983                canClose:   this.controller.isModeActive( 'grid' )
    59845984            });
     
    60126012            this.views.add( this.attachments );
    60136013
    6014             this.attachmentsNoResults = new media.View({
    6015                 controller: this.controller,
    6016                 tagName: 'p'
    6017             });
    6018 
    6019             this.attachmentsNoResults.$el.addClass( 'hidden no-media' );
    6020             this.attachmentsNoResults.$el.html( l10n.noMedia );
    6021 
    6022             this.views.add( this.attachmentsNoResults );
     6014
     6015            if ( this.controller.isModeActive( 'grid' ) ) {
     6016                this.attachmentsNoResults = new media.View({
     6017                    controller: this.controller,
     6018                    tagName: 'p'
     6019                });
     6020
     6021                this.attachmentsNoResults.$el.addClass( 'hidden no-media' );
     6022                this.attachmentsNoResults.$el.html( l10n.noMedia );
     6023
     6024                this.views.add( this.attachmentsNoResults );
     6025            }
    60236026        },
    60246027
  • trunk/src/wp-includes/media-template.php

    r29529 r29532  
    186186        <?php else : ?>
    187187            <div class="upload-ui">
    188                 <h3 class="upload-instructions drop-instructions"><?php _e( 'Drop files here' ); ?></h3>
     188                <h3 class="upload-instructions drop-instructions"><?php _e( 'Drop files anywhere to upload' ); ?></h3>
    189189                <p class="upload-instructions drop-instructions"><?php _ex( 'or', 'Uploader: Drop files here - or - Select Files' ); ?></p>
    190                 <a href="#" class="browser button"><?php _e( 'Select Files' ); ?></a>
     190                <a href="#" class="browser button button-hero"><?php _e( 'Select Files' ); ?></a>
    191191            </div>
    192192
Note: See TracChangeset for help on using the changeset viewer.