Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-21 20:35:00 +02:00
Code Issues Projects Releases Wiki Activity

Media: Reduces the bulk media options to have one primary button

Browse Source 
This fixes where 2 primary buttons were showing for bulk actions within media trash.

Props garrett-eclipse, afercia, ianbelanger, SergeyBiryukov
Fixes #46757, #46758

Built from https://develop.svn.wordpress.org/trunk@45701


git-svn-id: http://core.svn.wordpress.org/trunk@45512 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Tammie Lister 2019-07-30 23:20:57 +00:00
parent fa9980049e
commit d5c7657189
9 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/css/buttons-rtl.css
View File

@ -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 {

2
wp-includes/css/buttons-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

6
wp-includes/css/buttons.css
View File

@ -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 {

2
wp-includes/css/buttons.min.css vendored
View File

File diff suppressed because one or more lines are too long

1
wp-includes/js/media-grid.js
View File

@ -1011,6 +1011,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 ) {

2
wp-includes/js/media-grid.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
wp-includes/js/media-views.js
View File

@ -7838,7 +7838,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' ),
@ -7894,7 +7894,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,

4
wp-includes/js/media-views.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.3-alpha-45700';
$wp_version = '5.3-alpha-45701';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.