Changeset 22495

Timestamp:

11/09/2012 09:59:36 AM (12 years ago)

Author:

koopersmith

Message:

Media JS: Use basic upload/library by default.

wp.media now recognizes the frame attribute (currently a string; either'select' or 'post') and defaults to using a basic select frame. It also checks for the existence of classes in a safer fashion, as it does not assume the MediaFrame property exists.

see #21390.

Location:

trunk

Files:

• wp-admin/js/media-upload.js (modified) (1 diff)
• wp-includes/js/mce-view.js (modified) (1 diff)
• wp-includes/js/media-models.js (modified) (2 diffs)

trunk/wp-admin/js/media-upload.js

@@ -104 +104 @@
 
             workflow = workflows[ id ] = wp.media( _.defaults( options || {}, {
+                frame:    'post',
                 title:    wp.media.view.l10n.insertMedia,
                 multiple: true

trunk/wp-includes/js/mce-view.js

@@ -695 +695 @@
 
                 this.frame = wp.media({
+                    frame:     'post',
                     state:     'gallery-edit',
                     title:     mceview.l10n.editGallery,

trunk/wp-includes/js/media-models.js

@@ -8 +8 @@
      *
      * Handles the default media experience. Automatically creates
-     * and opens a media workflow, and returns the result.
+     * and opens a media frame, and returns the result.
      * Does nothing if the controllers do not exist.
      *
@@ -15 +15 @@
      */
     media = wp.media = function( attributes ) {
-        if ( media.view.MediaFrame.Post )
-            return new media.view.MediaFrame.Post( attributes ).render().attach().open();
+        var MediaFrame = media.view.MediaFrame,
+            frame;
+
+        if ( ! MediaFrame )
+            return;
+
+        attributes = _.defaults( attributes || {}, {
+            frame: 'select'
+        });
+
+        if ( 'select' === attributes.frame && MediaFrame.Select )
+            frame = new MediaFrame.Select( attributes );
+        else if ( 'post' === attributes.frame && MediaFrame.Post )
+            frame = new MediaFrame.Post( attributes );
+
+        delete attributes.frame;
+        return frame.render().attach().open();
     };