Changeset 29629

Timestamp:

08/26/2014 07:05:44 PM (12 years ago)

Author:

helen

Message:

Media: only apply wp-filter class to the grid view toolbar.

props gcorne.
fixes #29381.

File:

• trunk/src/wp-includes/js/media-views.js (modified) (2 diffs)

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

@@ -3912 +3912 @@
         media.view.Toolbar = media.View.extend({
                 tagName:   'div',
-                className: 'media-toolbar wp-filter',
+                className: 'media-toolbar',
 
                 initialize: function() {
@@ -5751 +5751 @@
 
                 createToolbar: function() {
-                        var LibraryViewSwitcher, Filters;
+                        var LibraryViewSwitcher, Filters, toolbarOptions;
+
+                        toolbarOptions = {
+                                controller: this.controller
+                        };
+
+                        if ( this.controller.isModeActive( 'grid' ) ) {
+                                toolbarOptions.className = 'media-toolbar wp-filter';
+                        }
 
                         /**
-                         * @member {wp.media.view.Toolbar}
-                         */
-                        this.toolbar = new media.view.Toolbar({
-                                controller: this.controller
-                        });
+                        * @member {wp.media.view.Toolbar}
+                        */
+                        this.toolbar = new media.view.Toolbar( toolbarOptions );
 
                         this.views.add( this.toolbar );