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, karmatosed. Merges [45701] to the 5.2 branch. Fixes #46757, #46758 Built from https://develop.svn.wordpress.org/branches/5.2@45841 git-svn-id: http://core.svn.wordpress.org/branches/5.2@45652 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
90c221a67c
commit
4ef44b9ab0
|
@ -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 {
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -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 {
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -994,6 +994,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 ) {
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -7685,7 +7685,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' ),
|
||||
|
@ -7741,7 +7741,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,
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -13,7 +13,7 @@
|
|||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '5.2.3-alpha-45840';
|
||||
$wp_version = '5.2.3-alpha-45841';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
|
Loading…
Reference in New Issue