Changeset 22568

Timestamp:

11/14/2012 09:06:10 AM (12 years ago)

Author:

koopersmith

Message:

Media: Make edit gallery button use new media. see #21390.

Location:

trunk

Files:

• wp-admin/includes/media.php (modified) (1 diff)
• wp-admin/js/media-upload.js (modified) (3 diffs)
• wp-includes/js/tinymce/plugins/wpgallery/editor_plugin_src.js (modified) (1 diff)
• wp-includes/media.php (modified) (2 diffs)

trunk/wp-admin/includes/media.php

@@ -384 +384 @@
  */
 function media_buttons($editor_id = 'content') {
-    wp_enqueue_media();
+    wp_enqueue_media( array(
+        'post' => get_post()
+    ) );
 
     $context = apply_filters('media_buttons_context', __('Upload/Insert %s'));

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

@@ -213 +213 @@
 
         return {
-            attachments: function( shortcode, parent ) {
+            defaults: {
+                order:      'ASC',
+                orderby:    'post__in',
+                id:         wp.media.view.settings.postId,
+                itemtag:    'dl',
+                icontag:    'dt',
+                captiontag: 'dd',
+                columns:    3,
+                size:       'thumbnail'
+            },
+
+            attachments: function( shortcode ) {
                 var shortcodeString = shortcode.string(),
                     result = galleries[ shortcodeString ],
@@ -241 +252 @@
 
                 if ( ! args.post__in )
-                    args.parent = attrs.id || parent;
+                    args.parent = attrs.id;
 
                 // Collect the attributes that were not included in `args`.
@@ -284 +295 @@
 
                 return shortcode;
+            },
+
+            edit: function( content ) {
+                var shortcode = wp.shortcode.next( 'gallery', content ),
+                    defaultPostId = wp.media.gallery.defaults.postId,
+                    attachments, selection;
+
+                // Bail if we didn't match the shortcode or all of the content.
+                if ( ! shortcode || shortcode.content !== content )
+                    return;
+
+                // Ignore the rest of the match object.
+                shortcode = shortcode.shortcode;
+
+                if ( _.isUndefined( shortcode.get('id') ) && ! _.isUndefined( defaultPostId ) )
+                    shortcode.set( 'id', defaultPostId );
+
+                attachments = wp.media.gallery.attachments( shortcode );
+
+                selection = new wp.media.model.Selection( attachments.models, {
+                    props:    attachments.props.toJSON(),
+                    multiple: true
+                });
+
+                selection.gallery = attachments.gallery;
+
+                return wp.media({
+                    frame:     'post',
+                    state:     'gallery-edit',
+                    title:     wp.media.view.l10n.editGalleryTitle,
+                    editing:   true,
+                    multiple:  true,
+                    selection: selection
+                });
             }
         };

trunk/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin_src.js

@@ -11 +11 @@
             // Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('...');
             ed.addCommand('WP_Gallery', function() {
-                var el = ed.selection.getNode(), post_id, vp = tinymce.DOM.getViewPort(),
-                    H = vp.h - 80, W = ( 640 < vp.w ) ? 640 : vp.w;
+                var el = ed.selection.getNode(),
+                    gallery = wp.media.gallery,
+                    frame;
 
-                if ( el.nodeName != 'IMG' ) return;
-                if ( ed.dom.getAttrib(el, 'class').indexOf('wpGallery') == -1 ) return;
+                // Check if the `wp.media.gallery` API exists.
+                if ( typeof wp === 'undefined' || ! wp.media || ! wp.media.gallery )
+                    return;
 
-                post_id = tinymce.DOM.get('post_ID').value;
-                tb_show('', tinymce.documentBaseURL + 'media-upload.php?post_id='+post_id+'&tab=gallery&TB_iframe=true&width='+W+'&height='+H);
+                // Make sure we've selected a gallery node.
+                if ( el.nodeName != 'IMG' || ed.dom.getAttrib(el, 'class').indexOf('wpGallery') == -1 )
+                    return;
 
-                tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
+                frame = gallery.edit( '[' + ed.dom.getAttrib( el, 'title' ) + ']' );
+
+                frame.get('gallery-edit').on( 'update', function( selection ) {
+                    var shortcode = gallery.shortcode( selection ).string().slice( 1, -1 );
+                    ed.dom.setAttrib( el, 'title', shortcode );
+                });
             });
 

trunk/wp-includes/media.php

@@ -1301 +1301 @@
  * @since 3.5.0
  */
-function wp_enqueue_media() {
+function wp_enqueue_media( $args = array() ) {
+    $defaults = array(
+        'post' => null,
+    );
+    $args = wp_parse_args( $args, $defaults );
+
     // We're going to pass the old thickbox media tabs to `media_upload_tabs`
     // to ensure plugins will work. We will then unset those tabs.
@@ -1321 +1326 @@
         ), admin_url('media-upload.php') ),
     );
+
+    if ( isset( $args['post'] ) )
+        $settings['postId'] = get_post( $args['post'] )->ID;
 
     wp_localize_script( 'media-views', '_wpMediaViewsL10n', array(