Changeset 29532

Timestamp:

08/18/2014 04:27:33 PM (11 years ago)

Author:

ocean90

Message:

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

fixes #28963.

Location:

trunk/src/wp-includes

Files:

• css/media-views.css (modified) (1 diff)
• js/media-grid.js (modified) (1 diff)
• js/media-views.js (modified) (2 diffs)
• media-template.php (modified) (1 diff)

trunk/src/wp-includes/css/media-views.css

@@ -260 +260 @@
     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);
 }
 

trunk/src/wp-includes/js/media-grid.js

@@ -227 +227 @@
 
         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 );
         },
 

trunk/src/wp-includes/js/media-views.js

@@ -5980 +5980 @@
                 controller: this.controller,
                 status:     false,
-                message:    l10n.noItemsFound,
+                message:    this.controller.isModeActive( 'grid' ) ? '' : l10n.noItemsFound,
                 canClose:   this.controller.isModeActive( 'grid' )
             });
@@ -6012 +6012 @@
             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 );
-
-            this.views.add( this.attachmentsNoResults );
+
+            if ( this.controller.isModeActive( 'grid' ) ) {
+                this.attachmentsNoResults = new media.View({
+                    controller: this.controller,
+                    tagName: 'p'
+                });
+
+                this.attachmentsNoResults.$el.addClass( 'hidden no-media' );
+                this.attachmentsNoResults.$el.html( l10n.noMedia );
+
+                this.views.add( this.attachmentsNoResults );
+            }
         },
 

trunk/src/wp-includes/media-template.php

@@ -186 +186 @@
         <?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>