Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions src/js/media/controllers/state.js
Original file line number Diff line number Diff line change
Expand Up @@ -165,15 +165,10 @@ var State = Backbone.Model.extend(/** @lends wp.media.controller.State.prototype
_menu: function() {
var menu = this.frame.menu,
mode = this.get('menu'),
actionMenuItems,
actionMenuLength,
view;

if ( this.frame.menu ) {
actionMenuItems = this.frame.menu.get('views'),
actionMenuLength = actionMenuItems ? actionMenuItems.views.get().length : 0,
// Show action menu only if it is active and has more than one default element.
this.frame.$el.toggleClass( 'hide-menu', ! mode || actionMenuLength < 2 );
this.frame.$el.toggleClass( 'hide-menu', ! mode );
}
if ( ! mode ) {
return;
Expand All @@ -182,6 +177,10 @@ var State = Backbone.Model.extend(/** @lends wp.media.controller.State.prototype
menu.mode( mode );

view = menu.get();
if ( view && view.visibility ) {
view.visibility();
}

if ( view && view.select ) {
view.select( this.id );
}
Expand Down
7 changes: 6 additions & 1 deletion src/js/media/views/menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,10 @@ Menu = PriorityList.extend(/** @lends wp.media.view.Menu.prototype */{
var region = this.region,
view = this.controller[ region ].get(),
views = this.views.get(),
hide = ! views || views.length < 2;
visibleMenuItems = views ? _.filter( views, function( item ) {
return ! item.$el.hasClass( 'separator' ) && ! item.$el.hasClass( 'hidden' );
}) : [],
hide = visibleMenuItems.length < 2;

if ( this === view ) {
// Flag this menu as hidden or visible.
Expand Down Expand Up @@ -125,6 +128,7 @@ Menu = PriorityList.extend(/** @lends wp.media.view.Menu.prototype */{
}

view.$el.addClass('hidden');
this.visibility();
},

show: function( id ) {
Expand All @@ -135,6 +139,7 @@ Menu = PriorityList.extend(/** @lends wp.media.view.Menu.prototype */{
}

view.$el.removeClass('hidden');
this.visibility();
}
});

Expand Down
Loading