Ticket #22775: 22775.diff

wp-admin/js/custom-background.js

@@ -32 +32 @@
                         }
 
                         // Create the media frame.
-                        frame = wp.media({
+                        frame = wp.media.frames.customBackground = wp.media({
                                 // Set the title of the modal.
                                 title: $el.data('choose'),
 

wp-admin/js/custom-header.js

@@ -18 +18 @@
                         var $el = $(this);
                         event.preventDefault();
 
+                        // If the media frame already exists, reopen it.
+                        if ( frame ) {
+                                frame.open();
+                                return;
+                        }
+
                         // Create the media frame.
-                        frame = wp.media({
+                        frame = wp.media.frames.customHeader = wp.media({
                                 // Set the title of the modal.
                                 title: $el.data('choose'),
 

wp-includes/js/media-models.js

@@ -34 +34 @@
                 return frame;
         };
 
-        _.extend( media, { model: {}, view: {}, controller: {} });
+        _.extend( media, { model: {}, view: {}, controller: {}, frames: {} });
 
         // Link any localized strings.
         l10n = media.model.l10n = typeof _wpMediaModelsL10n === 'undefined' ? {} : _wpMediaModelsL10n;
@@ -216 +216 @@
          * ========================================================================
          */
 
+         /**
+          * wp.media.attachment
+          */
+         media.attachment = function( id ) {
+                return Attachment.get( id );
+         };
+
         /**
          * wp.media.model.Attachment
          */