From c83f0b0d228e6955012395f5c92c7b3f6fa73de0 Mon Sep 17 00:00:00 2001 From: Tammie Lister Date: Tue, 30 Jul 2019 23:19:18 +0000 Subject: [PATCH] Media: Reduces the bulk media options to have one primary button This fixes where 2 primary buttons were showing for bulk actions within media trash. Props garrett-eclipse, afercia, ianbelanger, SergeyBiryukov Fixes #46757, #46758 git-svn-id: https://develop.svn.wordpress.org/trunk@45701 602fd350-edb4-49c9-b593-d223f7449a82 --- src/js/media/views/attachments/browser.js | 4 ++-- src/js/media/views/button/delete-selected.js | 1 + src/wp-includes/css/buttons.css | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/js/media/views/attachments/browser.js b/src/js/media/views/attachments/browser.js index ecc480c53a..6d9523298e 100644 --- a/src/js/media/views/attachments/browser.js +++ b/src/js/media/views/attachments/browser.js @@ -190,7 +190,7 @@ AttachmentsBrowser = View.extend(/** @lends wp.media.view.AttachmentsBrowser.pro disabled: true, text: mediaTrash ? l10n.trashSelected : l10n.deletePermanently, controller: this.controller, - priority: -60, + priority: -80, click: function() { var changed = [], removed = [], selection = this.controller.state().get( 'selection' ), @@ -246,7 +246,7 @@ AttachmentsBrowser = View.extend(/** @lends wp.media.view.AttachmentsBrowser.pro if ( mediaTrash ) { this.toolbar.set( 'deleteSelectedPermanentlyButton', new wp.media.view.DeleteSelectedPermanentlyButton({ filters: Filters, - style: 'primary', + style: 'link button-link-delete', disabled: true, text: l10n.deletePermanently, controller: this.controller, diff --git a/src/js/media/views/button/delete-selected.js b/src/js/media/views/button/delete-selected.js index 5023093d73..b5ad9f8d3b 100644 --- a/src/js/media/views/button/delete-selected.js +++ b/src/js/media/views/button/delete-selected.js @@ -22,6 +22,7 @@ DeleteSelected = Button.extend(/** @lends wp.media.view.DeleteSelectedButton.pro this.options.filters.model.on( 'change', this.filterChange, this ); } this.controller.on( 'selection:toggle', this.toggleDisabled, this ); + this.controller.on( 'select:activate', this.toggleDisabled, this ); }, filterChange: function( model ) { diff --git a/src/wp-includes/css/buttons.css b/src/wp-includes/css/buttons.css index 46361da432..35de508fc3 100644 --- a/src/wp-includes/css/buttons.css +++ b/src/wp-includes/css/buttons.css @@ -224,6 +224,12 @@ TABLE OF CONTENTS: .wp-core-ui .button-link-delete:hover, .wp-core-ui .button-link-delete:focus { color: #dc3232; + background: transparent; +} + +.wp-core-ui .button-link-delete:disabled { + /* overrides the default buttons disabled background */ + background: transparent !important; } .ie8 .wp-core-ui .button-link:focus {