From cb8328d912b13e77cf912c81cecc8942236ca99e Mon Sep 17 00:00:00 2001 From: Daryl Koopersmith Date: Sun, 3 Mar 2013 07:36:21 +0000 Subject: [PATCH] Media: Reset modal after gallery insertion. Removes hardcoded (and vestigial) 'upload' states in favor of using the default modal state. When a media toolbar action is triggered, reset the modal after switching to the new state (as opposed to beforehand). fixes #23675. git-svn-id: https://develop.svn.wordpress.org/trunk@23590 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/js/media-views.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/wp-includes/js/media-views.js b/wp-includes/js/media-views.js index b26bf64e5f..f21920f184 100644 --- a/wp-includes/js/media-views.js +++ b/wp-includes/js/media-views.js @@ -1829,7 +1829,7 @@ featuredImageToolbar: function( toolbar ) { this.createSelectToolbar( toolbar, { text: l10n.setFeaturedImage, - state: this.options.state || 'upload' + state: this.options.state }); }, @@ -1857,9 +1857,9 @@ controller.close(); state.trigger( 'update', state.get('library') ); + // Restore and reset the default state. + controller.setState( controller.options.state ); controller.reset(); - // @todo: Make the state activated dynamic (instead of hardcoded). - controller.setState('upload'); } } } @@ -2484,11 +2484,11 @@ if ( options.event ) controller.state().trigger( options.event ); - if ( options.reset ) - controller.reset(); - if ( options.state ) controller.setState( options.state ); + + if ( options.reset ) + controller.reset(); } });