Changeset 22770

Timestamp:

11/21/2012 04:46:32 PM (12 years ago)

Author:

koopersmith

Message:

Media: Move the new sections of media-upload.js to media-editor.js to allow the media modal to be used on the front end and prevent dependency conflicts with older themes and plugins. see #21390.

Location:

trunk

Files:

• wp-admin/js/media-upload.js (modified) (1 diff)
• wp-includes/js/media-editor.js (copied) (copied from trunk/wp-admin/js/media-upload.js)
• wp-includes/js/media-editor.min.js (copied) (copied from trunk/wp-admin/js/media-upload.min.js)
• wp-includes/js/media-models.js (modified) (3 diffs)
• wp-includes/media.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (2 diffs)

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

@@ -87 +87 @@
 
 })(jQuery);
-
-// WordPress, TinyMCE, and Media
-// -----------------------------
-(function($){
-    // Stores the editors' `wp.media.controller.Frame` instances.
-    var workflows = {},
-        linkToUrl;
-
-    linkToUrl = function( props, attachment ) {
-        var link = props.link || getUserSetting( 'urlbutton', 'post' ),
-            url;
-
-        if ( 'file' === link )
-            url = attachment.url;
-        else if ( 'post' === link )
-            url = attachment.link;
-        else if ( 'custom' === link )
-            url = props.linkUrl;
-
-        return url || '';
-    };
-
-    wp.media.string = {
-        // Joins the `props` and `attachment` objects,
-        // outputting the proper object format based on the
-        // attachment's type.
-        props: function( props, attachment ) {
-            var link, linkUrl, size, sizes;
-
-            props = props ? _.clone( props ) : {};
-
-            if ( attachment && attachment.type )
-                props.type = attachment.type;
-
-            if ( 'image' === props.type ) {
-                props = _.defaults( props || {}, {
-                    align:   getUserSetting( 'align', 'none' ),
-                    size:    getUserSetting( 'imgsize', 'medium' ),
-                    url:     '',
-                    classes: []
-                });
-            }
-
-            // All attachment-specific settings follow.
-            if ( ! attachment )
-                return props;
-
-            link = props.link || getUserSetting( 'urlbutton', 'post' );
-            if ( 'file' === link )
-                linkUrl = attachment.url;
-            else if ( 'post' === link )
-                linkUrl = attachment.link;
-            else if ( 'custom' === link )
-                linkUrl = props.linkUrl;
-            props.linkUrl = linkUrl || '';
-
-            // Format properties for images.
-            if ( 'image' === attachment.type ) {
-                props.classes.push( 'wp-image-' + attachment.id );
-
-                sizes = attachment.sizes;
-                size = sizes && sizes[ props.size ] ? sizes[ props.size ] : attachment;
-
-                _.extend( props, _.pick( attachment, 'align', 'caption' ), {
-                    width:     size.width,
-                    height:    size.height,
-                    src:       size.url,
-                    captionId: 'attachment_' + attachment.id
-                });
-
-            // Format properties for non-images.
-            } else {
-                _.extend( props, {
-                    title:   attachment.title || attachment.filename,
-                    rel:     'attachment wp-att-' + attachment.id
-                });
-            }
-
-            return props;
-        },
-
-        link: function( props, attachment ) {
-            var options;
-
-            props = wp.media.string.props( props, attachment );
-
-            options = {
-                tag:     'a',
-                content: props.title,
-                attrs:   {
-                    href: props.linkUrl
-                }
-            };
-
-            if ( props.rel )
-                options.attrs.rel = props.rel;
-
-            return wp.html.string( options );
-        },
-
-        image: function( props, attachment ) {
-            var img = {},
-                options, classes, shortcode, html;
-
-            props = wp.media.string.props( props, attachment );
-            classes = props.classes || [];
-
-            img.src = props.url;
-            _.extend( img, _.pick( props, 'width', 'height', 'alt' ) );
-
-            // Only assign the align class to the image if we're not printing
-            // a caption, since the alignment is sent to the shortcode.
-            if ( props.align && ! props.caption )
-                classes.push( 'align' + props.align );
-
-            if ( props.size )
-                classes.push( 'size-' + props.size );
-
-            img['class'] = _.compact( classes ).join(' ');
-
-            // Generate `img` tag options.
-            options = {
-                tag:    'img',
-                attrs:  img,
-                single: true
-            };
-
-            // Generate the `a` element options, if they exist.
-            if ( props.linkUrl ) {
-                options = {
-                    tag:   'a',
-                    attrs: {
-                        href: props.linkUrl
-                    },
-                    content: options
-                };
-            }
-
-            html = wp.html.string( options );
-
-            // Generate the caption shortcode.
-            if ( props.caption ) {
-                shortcode = {};
-
-                if ( img.width )
-                    shortcode.width = img.width;
-
-                if ( props.captionId )
-                    shortcode.id = props.captionId;
-
-                if ( props.align )
-                    shortcode.align = 'align' + props.align;
-
-                html = wp.shortcode.string({
-                    tag:     'caption',
-                    attrs:   shortcode,
-                    content: html + ' ' + props.caption
-                });
-            }
-
-            return html;
-        }
-    };
-
-    wp.media.gallery = (function() {
-        var galleries = {};
-
-        return {
-            defaults: {
-                order:      'ASC',
-                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 ],
-                    attrs, args, query, others;
-
-                delete galleries[ shortcodeString ];
-
-                if ( result )
-                    return result;
-
-                attrs = shortcode.attrs.named;
-                args  = _.pick( attrs, 'orderby', 'order' );
-
-                args.type    = 'image';
-                args.perPage = -1;
-
-                // Map the `ids` param to the correct query args.
-                if ( attrs.ids ) {
-                    args.post__in = attrs.ids.split(',');
-                    args.orderby  = 'post__in';
-                } else if ( attrs.include ) {
-                    args.post__in = attrs.include.split(',');
-                }
-
-                if ( attrs.exclude )
-                    args.post__not_in = attrs.exclude.split(',');
-
-                if ( ! args.post__in )
-                    args.parent = attrs.id;
-
-                // Collect the attributes that were not included in `args`.
-                others = {};
-                _.filter( attrs, function( value, key ) {
-                    if ( _.isUndefined( args[ key ] ) )
-                        others[ key ] = value;
-                });
-
-                query = media.query( args );
-                query.gallery = new Backbone.Model( others );
-                return query;
-            },
-
-            shortcode: function( attachments ) {
-                var props = attachments.props.toJSON(),
-                    attrs = _.pick( props, 'include', 'exclude', 'orderby', 'order' ),
-                    shortcode, clone;
-
-                if ( attachments.gallery )
-                    _.extend( attrs, attachments.gallery.toJSON() );
-
-                attrs.ids = attachments.pluck('id');
-
-                // If the `ids` attribute is set and `orderby` attribute
-                // is the default value, clear it for cleaner output.
-                if ( attrs.ids && 'post__in' === attrs.orderby )
-                    delete attrs.orderby;
-
-                // Remove default attributes from the shortcode.
-                _.each( wp.media.gallery.defaults, function( value, key ) {
-                    if ( value === attrs[ key ] )
-                        delete attrs[ key ];
-                });
-
-                shortcode = new wp.shortcode({
-                    tag:    'gallery',
-                    attrs:  attrs,
-                    type:   'single'
-                });
-
-                // Use a cloned version of the gallery.
-                clone = new wp.media.model.Attachments( attachments.models, {
-                    props: props
-                });
-                clone.gallery = attachments.gallery;
-                galleries[ shortcode.string() ] = clone;
-
-                return shortcode;
-            },
-
-            edit: function( content ) {
-                var shortcode = wp.shortcode.next( 'gallery', content ),
-                    defaultPostId = wp.media.gallery.defaults.id,
-                    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;
-
-                // Fetch the query's attachments, and then break ties from the
-                // query to allow for sorting.
-                selection.more().done( function() {
-                    // Break ties with the query.
-                    selection.props.set({ query: false });
-                    selection.unmirror();
-                    selection.props.unset('orderby');
-                });
-
-                return wp.media({
-                    frame:     'post',
-                    state:     'gallery-edit',
-                    title:     wp.media.view.l10n.editGalleryTitle,
-                    editing:   true,
-                    multiple:  true,
-                    selection: selection
-                });
-            }
-        };
-    }());
-
-    wp.media.editor = {
-        insert: send_to_editor,
-
-        add: function( id, options ) {
-            var workflow = this.get( id );
-
-            if ( workflow )
-                return workflow;
-
-            workflow = workflows[ id ] = wp.media( _.defaults( options || {}, {
-                frame:    'post',
-                title:    wp.media.view.l10n.insertMedia,
-                multiple: true
-            } ) );
-
-            workflow.on( 'insert', function( selection ) {
-                var state = workflow.state(),
-                    details = state.get('details');
-
-                selection = selection || state.get('selection');
-
-                if ( ! selection || ! details )
-                    return;
-
-                selection.each( function( attachment ) {
-                    var detail = details[ attachment.cid ];
-
-                    if ( detail )
-                        detail = detail.toJSON();
-
-                    // Reset the attachment details.
-                    delete details[ attachment.cid ];
-
-                    attachment = attachment.toJSON();
-
-                    this.send.attachment( detail, attachment );
-                }, this );
-            }, this );
-
-            workflow.get('gallery-edit').on( 'update', function( selection ) {
-                this.insert( wp.media.gallery.shortcode( selection ).string() );
-            }, this );
-
-            workflow.get('embed').on( 'select', function() {
-                var embed = workflow.state().toJSON();
-
-                embed.url = embed.url || '';
-
-                if ( 'link' === embed.type ) {
-                    _.defaults( embed, {
-                        title:   embed.url,
-                        linkUrl: embed.url
-                    });
-
-                    this.send.link( embed );
-
-                } else if ( 'image' === embed.type ) {
-                    _.defaults( embed, {
-                        title:   embed.url,
-                        linkUrl: '',
-                        align:   'none',
-                        link:    'none'
-                    });
-
-                    if ( 'none' === embed.link )
-                        embed.linkUrl = '';
-                    else if ( 'file' === embed.link )
-                        embed.linkUrl = embed.url;
-
-                    this.insert( wp.media.string.image( embed ) );
-                }
-            }, this );
-
-            return workflow;
-        },
-
-        get: function( id ) {
-            return workflows[ id ];
-        },
-
-        remove: function( id ) {
-            delete workflows[ id ];
-        },
-
-        send: {
-            attachment: function( props, attachment ) {
-                var caption = attachment.caption,
-                    options, html;
-
-                // If captions are disabled, clear the caption.
-                if ( ! wp.media.view.settings.captions )
-                    delete attachment.caption;
-
-                props = wp.media.string.props( props, attachment );
-
-                options = {
-                    id: attachment.id
-                };
-
-                if ( 'image' === attachment.type ) {
-                    html = wp.media.string.image( props );
-                    options['caption'] = caption;
-
-                    _.each({
-                        align:   'image-align',
-                        size:    'image-size',
-                        alt:     'image-alt',
-                        linkUrl: 'url'
-                    }, function( option, prop ) {
-                        if ( props[ prop ] )
-                            options[ option ] = props[ prop ];
-                    });
-
-                } else {
-                    html = wp.media.string.link( props );
-                    options.title = props.title;
-                }
-
-                return media.post( 'send-attachment-to-editor', {
-                    nonce:      wp.media.view.settings.nonce.sendToEditor,
-                    attachment: options,
-                    html:       html
-                }).done( function( resp ) {
-                    wp.media.editor.insert( resp );
-                });
-            },
-
-            link: function( embed ) {
-                return media.post( 'send-link-to-editor', {
-                    nonce: wp.media.view.settings.nonce.sendToEditor,
-                    src:   embed.linkUrl,
-                    title: embed.title,
-                    html:  wp.media.string.link( embed )
-                }).done( function( resp ) {
-                    wp.media.editor.insert( resp );
-                });
-            }
-        },
-
-        init: function() {
-            $(document.body).on('click', '.insert-media', function( event ) {
-                var $this = $(this),
-                    editor = $this.data('editor'),
-                    workflow;
-
-                event.preventDefault();
-
-                // Remove focus from the `.insert-media` button.
-                // Prevents Opera from showing the outline of the button
-                // above the modal.
-                //
-                // See: http://core.trac.wordpress.org/ticket/22445
-                $this.blur();
-
-                if ( ! _.isString( editor ) )
-                    return;
-
-                workflow = wp.media.editor.get( editor );
-
-                // If the workflow exists, just open it.
-                if ( workflow ) {
-                    workflow.open();
-                    return;
-                }
-
-                // Initialize the editor's workflow if we haven't yet.
-                wp.media.editor.add( editor );
-            });
-        }
-    };
-
-    $( wp.media.editor.init );
-}(jQuery));

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

@@ -41 +41 @@
     // Link any localized strings.
     l10n = media.model.l10n = typeof _wpMediaModelsL10n === 'undefined' ? {} : _wpMediaModelsL10n;
+
+    // Link any settings.
+    media.model.settings = l10n.settings || {};
+    delete l10n.settings;
 
     /**
@@ -125 +129 @@
             options = _.defaults( options || {}, {
                 type:    'POST',
-                url:     ajaxurl,
+                url:     media.model.settings.ajaxurl,
                 context: this
             });
@@ -222 +226 @@
                     action: 'save-attachment',
                     id:     this.id,
-                    nonce:  l10n.saveAttachmentNonce
+                    nonce:  media.model.settings.saveAttachmentNonce
                 });
 

trunk/wp-includes/media.php

@@ -1388 +1388 @@
     wp_localize_script( 'media-views', '_wpMediaViewsL10n', $strings );
 
-    wp_enqueue_script( 'media-upload' );
+    wp_enqueue_script( 'media-editor' );
     wp_enqueue_style( 'media-views' );
     wp_plupload_default_settings();

trunk/wp-includes/script-loader.php

@@ -299 +299 @@
     ) );
 
-    $scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox', 'shortcode', 'media-views' ), false, 1 );
+    $scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox', 'shortcode' ), false, 1 );
 
     $scripts->add( 'hoverIntent', "/wp-includes/js/hoverIntent$suffix.js", array('jquery'), 'r6', 1 );
@@ -319 +319 @@
     ) );
 
+    $scripts->add( 'shortcode', "/wp-includes/js/shortcode$suffix.js", array( 'underscore' ), false, 1 );
     $scripts->add( 'media-models', "/wp-includes/js/media-models$suffix.js", array( 'backbone', 'jquery' ), false, 1 );
     did_action( 'init' ) && $scripts->localize( 'media-models', '_wpMediaModelsL10n', array(
-        'saveAttachmentNonce' => wp_create_nonce( 'save-attachment' ),
-    ) );
-
+        'settings' => array(
+            'saveAttachmentNonce' => wp_create_nonce( 'save-attachment' ),
+            'ajaxurl' => admin_url( 'admin-ajax.php', 'relative' ),
+        ),
+    ) );
+
+    // To enqueue media-views or media-editor, call wp_enqueue_media().
+    // Both rely on numerous settings, styles, and templates to operate correctly.
     $scripts->add( 'media-views',  "/wp-includes/js/media-views$suffix.js",  array( 'media-models', 'wp-plupload' ), false, 1 );
-    $scripts->add( 'shortcode', "/wp-includes/js/shortcode$suffix.js", array( 'underscore' ), false, 1 );
+    $scripts->add( 'media-editor', "/wp-includes/js/media-editor$suffix.js", array( 'shortcode', 'media-views' ), false, 1 );
     $scripts->add( 'mce-view', "/wp-includes/js/mce-view$suffix.js", array( 'shortcode', 'media-models' ), false, 1 );