Changeset 29065

Timestamp:

07/10/2014 03:55:21 PM (11 years ago)

Author:

wonderboymusic

Message:

Media Grid: make the edit attachment icon clickable.

Props ericlewis.
See #24716.

Location:

trunk/src/wp-includes

Files:

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

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

@@ -2644 +2644 @@
 }
 
+.media-frame.mode-bulk-edit .attachment:hover .inline-toolbar {
+    display: none;
+}
 
 .edit-attachment-frame .edit-media-header .left:before {

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

@@ -1813 +1813 @@
 
             _.each( this.options.mode, function( mode ) {
-                this.activeModes.add( new Backbone.Model( { id: mode } ) );
+                this.activateMode( mode );
             }, this );
 
@@ -2006 +2006 @@
         },
         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' );
         },
@@ -2015 +2019 @@
             }
             this.activeModes.remove( this.activeModes.where( { id: mode } ) );
+            this.$el.removeClass( 'mode-' + mode );
             this.trigger( mode + ':deactivate' );
         }
@@ -4591 +4596 @@
 
         events: {
-            'click .attachment-preview':      'toggleSelectionHandler',
+            'click .js--select-attachment':   'toggleSelectionHandler',
             'change [data-setting]':          'updateSetting',
             'change [data-setting] input':    'updateSetting',

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

@@ -387 +387 @@
     <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>