Ticket #22713: 22713.2.diff

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

@@ -232 +232 @@
 .media-selection .selection-info a:last-child {
         border-right: 1px;
         border-left: 0;
+        margin-left: 0;
+        margin-right: -8px;
 }
 
 .media-selection:after {

wp-includes/css/media-views.css

@@ -1133 +1133 @@
         vertical-align: top;
 }
 
-.media-selection.empty {
+.media-selection.empty,
+.media-selection.editing {
         display: none;
 }
 
+.media-selection.one .edit-selection {
+        display: none;
+}
+
 .media-selection .count {
         display: block;
         padding-top: 12px;
@@ -1164 +1169 @@
 
 .media-selection .selection-info a:last-child {
         border-right: 0;
+        margin-right: 0;
 }
 
 .media-selection .selection-info .clear-selection {

wp-includes/js/media-views.js

@@ -1562 +1562 @@
                                         toolbar:    'main-gallery',
                                         filterable: 'uploaded',
                                         multiple:   'add',
-                                        editable:   true,
+                                        editable:   false,
 
                                         library:  media.query( _.defaults({
                                                 type: 'image'
@@ -3609 +3609 @@
 
                         this.views.set( '.selection-view', this.attachments );
                         this.collection.on( 'add remove reset', this.refresh, this );
+                        this.controller.on( 'content:activate', this.refresh, this );
                 },
 
                 ready: function() {
@@ -3620 +3621 @@
                         if ( ! this.$el.children().length )
                                 return;
 
+                        var collection = this.collection,
+                                editing = 'edit-selection' === this.controller.content.mode();
+
                         // If nothing is selected, display nothing.
-                        this.$el.toggleClass( 'empty', ! this.collection.length );
-                        this.$('.count').text( this.collection.length + ' ' + l10n.selected );
+                        this.$el.toggleClass( 'empty', ! collection.length );
+                        this.$el.toggleClass( 'one', 1 === collection.length );
+                        this.$el.toggleClass( 'editing', editing );
+
+                        this.$('.count').text( collection.length + ' ' + l10n.selected );
                 },
 
                 edit: function( event ) {