Ticket #24716: 24716.43.diff

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

@@ -2643 +2643 @@
         font-weight: 300;
 }
 
+.media-frame.mode-bulk-edit .attachment:hover .inline-toolbar {
+        display: none;
+}
 
 .edit-attachment-frame .edit-media-header .left:before {
         content: '\f340';

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

@@ -1812 +1812 @@
                         this.activeModes.on( 'add remove reset', _.bind( this.triggerModeEvents, this ) );
 
                         _.each( this.options.mode, function( mode ) {
-                                this.activeModes.add( new Backbone.Model( { id: mode } ) );
+                                this.activateMode( mode );
                         }, this );
 
                         // Force the uploader off if the upload limit has been exceeded or
@@ -2005 +2005 @@
                         this.trigger( eventToTrigger );
                 },
                 activateMode: function( mode ) {
+                        if ( this.activeModes.where( { id: mode } ).length ) {
+                                return;
+                        }
                         this.activeModes.add( [ { id: mode } ] );
+                        this.$el.addClass( 'mode-' + mode );
                         this.trigger( mode + ':activate' );
                 },
                 deactivateMode: function( mode ) {
@@ -2014 +2018 @@
                                 return;
                         }
                         this.activeModes.remove( this.activeModes.where( { id: mode } ) );
+                        this.$el.removeClass( 'mode-' + mode );
                         this.trigger( mode + ':deactivate' );
                 }
         });
@@ -4590 +4595 @@
                 },
 
                 events: {
-                        'click .attachment-preview':      'toggleSelectionHandler',
+                        'click .js--select-attachment':   'toggleSelectionHandler',
                         'change [data-setting]':          'updateSetting',
                         'change [data-setting] input':    'updateSetting',
                         'change [data-setting] select':   'updateSetting',

src/wp-includes/media-template.php

@@ -386 +386 @@
 
         <script type="text/html" id="tmpl-attachment">
                 <# if ( _.contains( data.controller.options.mode, 'grid' ) ) { #>
-                <div class="inline-toolbar">
+                <div class="inline-toolbar js--select-attachment">
                         <div class="dashicons dashicons-edit edit edit-media"></div>
                 </div>
                 <# } #>
-                <div class="attachment-preview type-{{ data.type }} subtype-{{ data.subtype }} {{ data.orientation }}">
+                <div class="attachment-preview js--select-attachment type-{{ data.type }} subtype-{{ data.subtype }} {{ data.orientation }}">
                         <# if ( data.uploading ) { #>
                                 <div class="media-progress-bar"><div></div></div>
                         <# } else if ( 'image' === data.type ) { #>