Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-11 10:59:07 +01:00
Code Issues Projects Releases Wiki Activity

Update gallery editing to work with the modal changes. Add nice handling for default states.

Browse Source 
Props koopersmith
see #21776


git-svn-id: http://core.svn.wordpress.org/trunk@22984 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Ryan Boren 2012-12-03 04:38:10 +00:00
parent db0ef72326
commit b382901778
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/js/media-editor.js
View File

@ -304,7 +304,7 @@
editing: true,
multiple: true,
selection: selection
});
}).open();
return this.frame;
}

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

@ -1141,6 +1141,14 @@
this.on( 'attach', _.bind( this.views.ready, this.views ), this );
},
render: function() {
// Activate the default state if no active state exists.
if ( ! this.state() && this.options.state )
this.setState( this.options.state );
return media.view.Frame.prototype.render.apply( this, arguments );
},
createIframeStates: function( options ) {
var settings = media.view.settings,
tabs = settings.tabs,