Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-28 15:17:42 +02:00
Code Issues Projects Releases Wiki Activity

Media Grid: on page load with ?item= in the URL, if the model is not in the library: fetch it. Defer the triggering of edit:attachment until the model has been fetched.

Browse Source 
Fixes #29052.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29301 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-08-18 02:13:16 +00:00
parent 68a3e1af2c
commit 5aee14e9a1
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -306,10 +306,20 @@
// Show the modal with a specific item
showItem: function( query ) {
var library = media.frame.state().get('library');
var library = media.frame.state().get('library'), item;
// Trigger the media frame to open the correct item
media.frame.trigger( 'edit:attachment', library.findWhere( { id: parseInt( query, 10 ) } ) );
item = library.findWhere( { id: parseInt( query, 10 ) } );
if ( item ) {
media.frame.trigger( 'edit:attachment', item );
} else {
item = media.attachment( query );
media.frame.listenTo( item, 'change', function( model ) {
media.frame.stopListening( item );
media.frame.trigger( 'edit:attachment', model );
} );
item.fetch();
}
}
});
@ -373,9 +383,6 @@
if ( this.options.model ) {
this.model = this.options.model;
} else {
// this is a hack
this.model = this.library.at( 0 );
}
this.bindHandlers();

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

File diff suppressed because one or more lines are too long