Changeset 23031

Timestamp:

12/04/2012 06:23:47 PM (12 years ago)

Author:

ryan

Message:

Media: Hide "Edit" link in the selection view when it doesn't make sense

Props koopersmith, ocean90, nacin
fixes #22713

Location:

trunk/wp-includes

Files:

• css/media-views-rtl.css (modified) (1 diff)
• css/media-views.css (modified) (2 diffs)
• js/media-views.js (modified) (3 diffs)

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

@@ -233 +233 @@
     border-right: 1px;
     border-left: 0;
+    margin-left: 0;
+    margin-right: -8px;
 }
 

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

@@ -1117 +1117 @@
 }
 
-.media-selection.empty {
+.media-selection.empty,
+.media-selection.editing {
+    display: none;
+}
+
+.media-selection.one .edit-selection {
     display: none;
 }
@@ -1148 +1153 @@
 .media-selection .selection-info a:last-child {
     border-right: 0;
+    margin-right: 0;
 }
 

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

@@ -1568 +1568 @@
                     filterable: 'uploaded',
                     multiple:   'add',
-                    editable:   true,
+                    editable:   false,
 
                     library:  media.query( _.defaults({
@@ -3639 +3639 @@
             this.views.set( '.selection-view', this.attachments );
             this.collection.on( 'add remove reset', this.refresh, this );
+            this.controller.on( 'content:activate', this.refresh, this );
         },
 
@@ -3650 +3651 @@
                 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 );
         },