Changeset 29525

Timestamp:

08/18/2014 02:13:01 AM (10 years ago)

Author:

wonderboymusic

Message:

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.

Fixes #29052.

File:

• trunk/src/wp-includes/js/media-grid.js (modified) (2 diffs)

trunk/src/wp-includes/js/media-grid.js

@@ -307 +307 @@
         // 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();
+            }
         }
     });
@@ -374 +384 @@
             if ( this.options.model ) {
                 this.model = this.options.model;
-            } else {
-                // this is a hack
-                this.model = this.library.at( 0 );
             }