From eb3dc78a61ff43d893790217b6f4b4d4ca6301d7 Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Tue, 4 Dec 2012 18:23:47 +0000 Subject: [PATCH] Media: Hide "Edit" link in the selection view when it doesn't make sense Props koopersmith, ocean90, nacin fixes #22713 git-svn-id: https://develop.svn.wordpress.org/trunk@23031 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/css/media-views-rtl.css | 2 ++ wp-includes/css/media-views.css | 8 +++++++- wp-includes/js/media-views.js | 13 ++++++++++--- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/wp-includes/css/media-views-rtl.css b/wp-includes/css/media-views-rtl.css index 195ab08b4c..28c78b267a 100644 --- a/wp-includes/css/media-views-rtl.css +++ b/wp-includes/css/media-views-rtl.css @@ -232,6 +232,8 @@ .media-selection .selection-info a:last-child { border-right: 1px; border-left: 0; + margin-left: 0; + margin-right: -8px; } .media-selection:after { diff --git a/wp-includes/css/media-views.css b/wp-includes/css/media-views.css index 5cedf53941..14f7ad3ca3 100644 --- a/wp-includes/css/media-views.css +++ b/wp-includes/css/media-views.css @@ -1116,7 +1116,12 @@ vertical-align: top; } -.media-selection.empty { +.media-selection.empty, +.media-selection.editing { + display: none; +} + +.media-selection.one .edit-selection { display: none; } @@ -1147,6 +1152,7 @@ .media-selection .selection-info a:last-child { border-right: 0; + margin-right: 0; } .media-selection .selection-info .clear-selection { diff --git a/wp-includes/js/media-views.js b/wp-includes/js/media-views.js index 175bd5b4f7..af38825f0d 100644 --- a/wp-includes/js/media-views.js +++ b/wp-includes/js/media-views.js @@ -1567,7 +1567,7 @@ toolbar: 'main-gallery', filterable: 'uploaded', multiple: 'add', - editable: true, + editable: false, library: media.query( _.defaults({ type: 'image' @@ -3638,6 +3638,7 @@ 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() { @@ -3649,9 +3650,15 @@ 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 ) {