Changeset 29266

Timestamp:

07/22/2014 04:20:59 PM (11 years ago)

Author:

wonderboymusic

Message:

Media Grid: general JS cleanup.

Props ericlewis.
See #28965.

Location:

trunk/src/wp-includes

Files:

• css/media-views.css (modified) (13 diffs)
• js/media-grid.js (modified) (26 diffs)
• js/media-views.js (modified) (11 diffs)
• media-template.php (modified) (2 diffs)

trunk/src/wp-includes/css/media-views.css

@@ -913 +913 @@
 
 .attachment.details,
-.media-grid-view .selected.attachment {
+.media-frame.mode-grid .selected.attachment {
     -webkit-box-shadow: 0 0 0 1px #fff,
                 0 0 0 5px #1e8cbe;
@@ -922 +922 @@
 .attachment.details .check,
 .attachment.selected .check:focus,
-.media-grid-view .attachment.selected .check {
+.media-frame.mode-grid .attachment.selected .check {
     background-color: #1e8cbe;
     -webkit-box-shadow: 0 0 0 1px #fff,
@@ -930 +930 @@
 }
 
-.media-grid-view .attachment .check {
-    display: block;
-}
-
-.media-grid-view .attachment .check div {
+.media-frame.mode-grid .attachment .check {
+    display: block;
+}
+
+.media-frame.mode-grid .attachment .check div {
     background-position: 21px 0;
 }
 
 .attachment.details .check div,
-.media-grid-view .attachment.selected .check div {
+.media-frame.mode-grid .attachment.selected .check div {
     background-position: -21px 0;
 }
@@ -945 +945 @@
 .attachment.details .check:hover div,
 .attachment.selected .check:focus div,
-.media-grid-view .attachment.selected .check:hover div {
+.media-frame.mode-grid .attachment.selected .check:hover div {
     background-position: -60px 0;
 }
@@ -1069 +1069 @@
 }
 
-.attachment-preview:hover ~ .inline-toolbar {
+.attachment-preview:hover + .inline-toolbar,
+.inline-toolbar:hover {
     display: block;
 }
@@ -2597 +2598 @@
  * Media Grid
  */
-.media-grid-view,
-.media-grid-view .media-frame-content,
-.media-grid-view .attachments-browser .attachments,
-.media-grid-view .uploader-inline-content {
+.media-frame.mode-grid,
+.media-frame.mode-grid .media-frame-content,
+.media-frame.mode-grid .attachments-browser .attachments,
+.media-frame.mode-grid .uploader-inline-content {
     position: static;
 }
 
 /* Regions we don't use at all */
-.media-grid-view .media-frame-title,
-.media-grid-view .media-frame-toolbar,
-.media-grid-view .media-frame-menu {
-    display: none;
-}
-
-.media-grid-view .media-frame-content {
+.media-frame.mode-grid .media-frame-title,
+.media-frame.mode-grid .media-frame-toolbar,
+.media-frame.mode-grid .media-frame-router,
+.media-frame.mode-grid .media-frame-menu {
+    display: none;
+}
+
+.media-frame.mode-grid .media-frame-content {
     background-color: transparent;
     border: none;
 }
 
-.media-grid-view .uploader-inline {
+.media-frame.mode-grid .uploader-inline {
     position: relative;
     top: auto;
@@ -2626 +2628 @@
 }
 
-.media-grid-view .media-toolbar select {
+.media-frame.mode-grid .media-toolbar select {
     margin-top: 1px;
     font-size: inherit;
 }
 
-.media-grid-view .attachments-browser .bulk-select {
+.media-frame.mode-grid .attachments-browser .bulk-select {
     display: inline-block;
 }
@@ -2640 +2642 @@
  * This should be OOCSS'd so both use a shared selector.
  */
-.media-grid-view .attachments-browser .media-toolbar {
+.media-frame.mode-grid .attachments-browser .media-toolbar {
     background: #fff;
     -webkit-box-shadow: 0 1px 1px 0 rgba(0,0,0,.1);
@@ -2658 +2660 @@
 }
 
-.media-grid-view input[type="search"] {
+.media-frame.mode-grid input[type="search"] {
     margin: 1px;
     padding: 3px 5px;
@@ -2670 +2672 @@
 }
 
-.media-grid-view .view-switch {
+.media-frame.mode-grid .view-switch {
     display: inline-block;
     float: none;
@@ -2678 +2680 @@
 }
 
-.media-grid-view select {
+.media-frame.mode-grid select {
     margin: 0 10px 0 0;
 }
 
-.media-grid-view .spinner {
+.media-frame.mode-grid .spinner {
     margin-top: 15px;
 }
 
-.media-grid-view .attachments-browser {
+.media-frame.mode-grid .attachments-browser {
     padding: 0;
 }
 
-.media-grid-view .attachments-browser .no-media {
+.media-frame.mode-grid .attachments-browser .no-media {
     color: #999;
     font-size: 18px;
@@ -2806 +2808 @@
     bottom: 0;
     top: 56px;
-}
-
-/* Hiding this for the moment instead of removing it from the template. */
-.edit-attachment-frame h3 {
-    display: none;
 }
 
@@ -2954 +2951 @@
 
 @media only screen and (max-width: 1120px) {
-    .media-grid-view .attachments-browser .media-toolbar-primary,
-    .media-grid-view .attachments-browser .media-toolbar-secondary {
+    .media-frame.mode-grid .attachments-browser .media-toolbar-primary,
+    .media-frame.mode-grid .attachments-browser .media-toolbar-secondary {
         float: none;
     }
 
-    .media-grid-view input[type="search"] {
+    .media-frame.mode-grid input[type="search"] {
         margin: 20px 0;
         position: static;

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

@@ -1 +1 @@
 /* global _wpMediaViewsL10n, MediaElementPlayer, _wpMediaGridSettings, confirm */
 (function($, _, Backbone, wp) {
+    // Local reference to the WordPress media namespace.
     var media = wp.media, l10n;
 
-    // Link any localized strings.
+    // Link localized strings and settings.
     if ( media.view.l10n ) {
         l10n = media.view.l10n;
@@ -12 +13 @@
 
     /**
+     * wp.media.controller.EditAttachmentMetadata
+     *
      * A state for editing an attachment's metadata.
      *
@@ -21 +24 @@
         defaults: {
             id:      'edit-attachment',
+            // Title string passed to the frame's title region view.
             title:   l10n.attachmentDetails,
             // Region mode defaults.
+            content: 'edit-metadata',
             menu:    false,
-            content: 'edit-metadata',
-
-            url:     ''
-        },
-
-        _ready: function() {},
-
-        /**
-         * Override media.controller.State._postActivate, since this state doesn't
-         * include the regions expected there.
-         */
-        _postActivate: function() {
-            this.frame.on( 'title:render:default', this._renderTitle, this );
-
-            this._title();
-            this._content();
-        },
-
-        /**
-         * @access private
-         */
-        _title: function() {
-            this.frame.title.render( this.get('titleMode') || 'default' );
-        },
-        /**
-         * @access private
-         */
-        _renderTitle: function( view ) {
-            view.$el.text( this.get('title') || '' );
-        },
-
-        _content: function() {
-            var mode = this.get( 'content' );
-            if ( mode ) {
-                this.frame.content.render( mode );
-            }
+            toolbar: false,
+            router:  false
         }
     });
@@ -88 +59 @@
                 modal:     false,
                 selection: [],
-                library:   {},
+                library:   {}, // Options hash for the query to the media library.
                 multiple:  'add',
                 state:     'library',
                 uploader:  true,
-                mode:      [ 'grid', 'edit' ]
+                mode:      [ 'grid' ]
             });
 
             $(document).on( 'click', '.add-new-h2', _.bind( this.addNewClickHandler, this ) );
-            $(document).on( 'screen:options:open', _.bind( this.screenOptionsOpen, this ) );
-            $(document).on( 'screen:options:close', _.bind( this.screenOptionsClose, this ) );
 
             // Ensure core and media grid view UI is enabled.
-            this.$el.addClass('wp-core-ui media-grid-view');
+            this.$el.addClass('wp-core-ui');
 
             // Force the uploader off if the upload limit has been exceeded or
@@ -123 +92 @@
             }
 
-            /**
-             * call 'initialize' directly on the parent class
-             */
+            // Call 'initialize' directly on the parent class.
             media.view.MediaFrame.prototype.initialize.apply( this, arguments );
 
-            // Since we're not using the default modal built into
-            // a media frame, append our $element to the supplied container.
+            // Append the frame view directly the supplied container.
             this.$el.appendTo( this.options.container );
 
-            this.createSelection();
             this.createStates();
-            this.bindHandlers();
+            this.bindRegionModeHandlers();
             this.render();
 
@@ -146 +111 @@
             }, 1000 ) );
 
+            // This is problematic.
             _.delay( _.bind( this.createRouter, this ), 1000 );
-        },
-
-        screenOptionsOpen: function() {
-            this.$el.addClass( 'media-grid-view-options' );
-        },
-
-        screenOptionsClose: function() {
-            this.$el.removeClass( 'media-grid-view-options' );
         },
 
@@ -169 +127 @@
         },
 
-        createSelection: function() {
-            var selection = this.options.selection;
-
-            if ( ! (selection instanceof media.model.Selection) ) {
-                this.options.selection = new media.model.Selection( selection, {
-                    multiple: this.options.multiple
-                });
-            }
-
-            this._selection = {
-                attachments: new media.model.Attachments(),
-                difference: []
-            };
-        },
-
+        /**
+         * Create the default states for the frame.
+         */
         createStates: function() {
             var options = this.options;
@@ -197 +143 @@
                     multiple:   options.multiple,
                     title:      options.title,
-                    priority:   20,
-
-                    router:     false,
                     content:    'browse',
 
@@ -207 +150 @@
         },
 
-        bindHandlers: function() {
+        /**
+         * Bind region mode activation events to proper handlers.
+         */
+        bindRegionModeHandlers: function() {
             this.on( 'content:create:browse', this.browseContent, this );
-            this.on( 'content:render:edit-image', this.editImageContent, this );
 
             // Handle a frame-level event for editing an attachment.
-            this.on( 'edit:attachment', this.editAttachment, this );
-        },
-
+            this.on( 'edit:attachment', this.openEditAttachmentModal, this );
+        },
+
+        /**
+         * Click handler for the `Add New` button.
+         */
         addNewClickHandler: function( event ) {
             event.preventDefault();
@@ -223 +171 @@
          * Open the Edit Attachment modal.
          */
-        editAttachment: function( model ) {
+        openEditAttachmentModal: function( model ) {
             // Create a new EditAttachment frame, passing along the library and the attachment model.
             wp.media( {
@@ -234 +182 @@
 
         /**
-         * Content
+         * Create an attachments browser view within the content region.
          *
-         * @param {Object} content
+         * @param {Object} contentRegion Basic object with a `view` property, which
+         *                               should be set with the proper region view.
          * @this wp.media.controller.Region
          */
-        browseContent: function( content ) {
+        browseContent: function( contentRegion ) {
             var state = this.state();
 
             // Browse our library of attachments.
-            content.view = new media.view.AttachmentsBrowser({
+            contentRegion.view = new media.view.AttachmentsBrowser({
                 controller: this,
                 collection: state.get('library'),
@@ -260 +209 @@
                 AttachmentView: state.get('AttachmentView')
             });
-        },
-
-        editImageContent: function() {
-            var image = this.state().get('image'),
-                view = new media.view.EditImage( { model: image, controller: this } ).render();
-
-            this.content.set( view );
-
-            // after creating the wrapper view, load the actual editor via an ajax call
-            view.loadEditor();
-
-        }
-    });
-
+        }
+    });
+
+    /**
+     * A similar view to media.view.Attachment.Details
+     * for use in the Edit Attachment modal.
+     *
+     * @constructor
+     * @augments wp.media.view.Attachment.Details
+     * @augments wp.media.view.Attachment
+     * @augments wp.media.View
+     * @augments wp.Backbone.View
+     * @augments Backbone.View
+     */
     media.view.Attachment.Details.TwoColumn = media.view.Attachment.Details.extend({
-        template: wp.template( 'attachment-details-two-column' ),
-
-        events: {
-            'change [data-setting]':          'updateSetting',
-            'change [data-setting] input':    'updateSetting',
-            'change [data-setting] select':   'updateSetting',
-            'change [data-setting] textarea': 'updateSetting',
-            'click .delete-attachment':       'deleteAttachment',
-            'click .trash-attachment':        'trashAttachment',
-            'click .edit-attachment':         'editAttachment',
-            'click .refresh-attachment':      'refreshAttachment',
-            'click .edit-image':              'handleEditImageClick'
-        },
-
-        initialize: function() {
-            if ( ! this.model ) {
-                return;
-            }
-
-            this.$el.attr('aria-label', this.model.get( 'title' ) ).attr( 'aria-checked', false );
-
-            this.model.on( 'change:title',   this._syncTitle, this );
-            this.model.on( 'change:caption', this._syncCaption, this );
-            this.model.on( 'change:percent', this.progress, this );
-            this.model.on( 'change:album',   this._syncAlbum, this );
-            this.model.on( 'change:artist',  this._syncArtist, this );
-
-            // Update the selection.
-            this.model.on( 'add', this.select, this );
-            this.model.on( 'remove', this.deselect, this );
-            this.model.on( 'sync', this.afterDelete, this );
-        },
+        template: media.template( 'attachment-details-two-column' ),
 
         preDestroy: function( event ) {
@@ -325 +243 @@
         },
 
-        handleEditImageClick: function() {
+        editAttachment: function( event ) {
+            event.preventDefault();
             this.controller.setState( 'edit-image' );
         },
+
+        /**
+         * Noop this from parent class, doesn't apply here.
+         */
+        toggleSelectionHandler: function() {},
 
         afterDelete: function( model ) {
@@ -352 +276 @@
 
             media.mixin.removeAllPlayers();
-            $( 'audio, video', this.$el ).each( function (i, elem) {
+            this.$( 'audio, video' ).each( function (i, elem) {
                 var el = media.view.MediaDetails.prepareSrc( elem );
                 new MediaElementPlayer( el, media.mixin.mejsSettings );
@@ -360 +284 @@
 
     /**
-     * A router for handling the browser history and application state
+     * A router for handling the browser history and application state.
+     *
+     * @constructor
+     * @augments Backbone.Router
      */
     media.view.MediaFrame.Manage.Router = Backbone.Router.extend({
         routes: {
-            'upload.php?item=:slug':    'showitem',
+            'upload.php?item=:slug':    'showItem',
             'upload.php?search=:query': 'search',
             ':default':                 'defaultRoute'
@@ -382 +309 @@
 
         // Show the modal with a specific item
-        showitem: function( query ) {
+        showItem: function( query ) {
             var library = media.frame.state().get('library');
 
@@ -411 +338 @@
      *
      * Requires an attachment model to be passed in the options hash under `model`.
+     *
+     * @constructor
+     * @augments wp.media.view.Frame
+     * @augments wp.media.View
+     * @augments wp.Backbone.View
+     * @augments Backbone.View
+     * @mixes wp.media.controller.StateMachine
      */
     media.view.MediaFrame.EditAttachments = media.view.MediaFrame.extend({
@@ -444 +378 @@
             this.createStates();
 
-            this.on( 'content:render:edit-metadata', this.editMetadataContent, this );
-            this.on( 'content:render:edit-image', this.editImageContentUgh, this );
+            this.on( 'content:create:edit-metadata', this.editMetadataMode, this );
+            this.on( 'content:create:edit-image', this.editImageMode, this );
             this.on( 'close', this.detach );
 
@@ -474 +408 @@
                 } );
 
+                // Set this frame as the modal's content.
                 this.modal.content( this );
                 this.modal.open();
@@ -497 +432 @@
         /**
          * Content region rendering callback for the `edit-metadata` mode.
-         */
-        editMetadataContent: function() {
-            var view = new media.view.Attachment.Details.TwoColumn({
+         *
+         * @param {Object} contentRegion Basic object with a `view` property, which
+         *                               should be set with the proper region view.
+         */
+        editMetadataMode: function( contentRegion ) {
+            contentRegion.view = new media.view.Attachment.Details.TwoColumn({
                 controller: this,
                 model:      this.model
             });
-            this.content.set( view );
             // Update browser url when navigating media details
             if ( this.model ) {
                 this.gridRouter.navigate( this.gridRouter.baseUrl( '?item=' + this.model.id ) );
-            } else {
-                this.resetRoute();
-            }
-        },
-
-        /**
-         * For some reason the view doesn't exist in the DOM yet, don't have the
-         * patience to track this down right now.
-         */
-        editImageContentUgh: function() {
-            _.defer( _.bind( this.editImageContent, this ) );
+            }
         },
 
         /**
          * Render the EditImage view into the frame's content region.
-         */
-        editImageContent: function() {
-            var view = new media.view.EditImage( { model: this.model, controller: this } ).render();
-
-            this.content.set( view );
-
-            // after creating the wrapper view, load the actual editor via an ajax call
-            view.loadEditor();
-        },
-
+         * 
+         * @param {Object} contentRegion Basic object with a `view` property, which
+         *                               should be set with the proper region view.
+         */
+        editImageMode: function( contentRegion ) {
+            contentRegion.view = new media.view.EditImage( { model: this.model, controller: this } );
+            // Defer a call to load the editor, which
+            // requires DOM elements to exist.
+            _.defer( _.bind( contentRegion.view.loadEditor, contentRegion.view ) );
+        },
+
+        /**
+         * Close this modal and immediately open another one.
+         *
+         * Allows for quickly swapping out the attachment being edited.
+         */
         resetContent: function() {
             this.modal.close();
@@ -604 +537 @@
     });
 
+    /**
+     * Controller for bulk selection.
+     */
     media.view.BulkSelection = media.View.extend({
         className: 'bulk-select',
@@ -629 +565 @@
     });
 
+    /**
+     * Bulk Selection dropdown view.
+     *
+     * @constructor
+     * @augments wp.media.View
+     * @augments wp.Backbone.View
+     * @augments Backbone.View
+     */
     media.view.BulkSelectionActionDropdown = media.View.extend({
         tagName:   'select',
@@ -638 +582 @@
                 .append( $('<option></option>').val( 'delete' ).html( l10n.deletePermanently ) );
             this.$el.prop( 'disabled', true );
-            this.$el.on( 'change', _.bind( this.toggleChange, this ) );
-        },
-
-        toggleChange: function() {
+            this.$el.on( 'change', _.bind( this.changeHandler, this ) );
+        },
+
+        /**
+         * Change handler for the dropdown.
+         *
+         * Sets the bulk selection controller's currentAction.
+         */
+        changeHandler: function() {
             this.controller.model.set( { 'currentAction': this.$el.val() } );
         },
+
+        /**
+         * Enable or disable the dropdown if attachments have been selected.
+         */
         enabled: function() {
             var disabled = ! this.controller.controller.state().get('selection').length;
@@ -650 +603 @@
     });
 
+    /**
+     * Bulk Selection dropdown view.
+     *
+     * @constructor
+     *
+     * @augments wp.media.view.Button
+     * @augments wp.media.View
+     * @augments wp.Backbone.View
+     * @augments Backbone.View
+     */
     media.view.BulkSelectionActionButton = media.view.Button.extend({
         tagName: 'button',
@@ -659 +622 @@
             this.listenTo( this.controller.controller.state().get( 'selection' ), 'add remove reset', _.bind( this.enabled, this ) );
         },
-
+        /**
+         * Button click handler.
+         */
         click: function() {
             var selection = this.controller.controller.state().get('selection');
@@ -673 +638 @@
             this.enabled();
         },
-
+        /**
+         * Enable or disable the button depending if a bulk action is selected
+         * in the bulk select dropdown, and if attachments have been selected.
+         */
         enabled: function() {
             var currentAction = this.controller.model.get( 'currentAction' ),

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

@@ -1686 +1686 @@
     media.view.Frame = media.View.extend({
         initialize: function() {
+            _.defaults( this.options, {
+                mode: [ 'select' ]
+            });
             this._createRegions();
             this._createStates();
+            this._createModes();
         },
 
@@ -1722 +1726 @@
             }
         },
+        _createModes: function() {
+            // Store active "modes" that the frame is in. Unrelated to region modes.
+            this.activeModes = new Backbone.Collection();
+            this.activeModes.on( 'add remove reset', _.bind( this.triggerModeEvents, this ) );
+
+            _.each( this.options.mode, function( mode ) {
+                this.activateMode( mode );
+            }, this );
+        },
         /**
          * @returns {wp.media.view.Frame} Returns itself to allow chaining
@@ -1728 +1741 @@
             this.states.invoke( 'trigger', 'reset' );
             return this;
-        }
-    });
-
-    // Make the `Frame` a `StateMachine`.
-    _.extend( media.view.Frame.prototype, media.controller.StateMachine.prototype );
-
-    /**
-     * wp.media.view.MediaFrame
-     *
-     * Type of frame used to create the media modal.
-     *
-     * @constructor
-     * @augments wp.media.view.Frame
-     * @augments wp.media.View
-     * @augments wp.Backbone.View
-     * @augments Backbone.View
-     * @mixes wp.media.controller.StateMachine
-     */
-    media.view.MediaFrame = media.view.Frame.extend({
-        className: 'media-frame',
-        template:  media.template('media-frame'),
-        regions:   ['menu','title','content','toolbar','router'],
-
-        /**
-         * @global wp.Uploader
-         */
-        initialize: function() {
-            media.view.Frame.prototype.initialize.apply( this, arguments );
-
-            _.defaults( this.options, {
-                title:    '',
-                modal:    true,
-                uploader: true,
-                mode:     [ 'select' ]
-            });
-
-            // Ensure core UI is enabled.
-            this.$el.addClass('wp-core-ui');
-
-            // Initialize modal container view.
-            if ( this.options.modal ) {
-                this.modal = new media.view.Modal({
-                    controller: this,
-                    title:      this.options.title
-                });
-
-                this.modal.content( this );
-            }
-
-            // Store active "modes" that the frame is in. Unrelated to region modes.
-            this.activeModes = new Backbone.Collection();
-            this.activeModes.on( 'add remove reset', _.bind( this.triggerModeEvents, this ) );
-
-            _.each( this.options.mode, function( mode ) {
-                this.activateMode( mode );
-            }, this );
-
-            // Force the uploader off if the upload limit has been exceeded or
-            // if the browser isn't supported.
-            if ( wp.Uploader.limitExceeded || ! wp.Uploader.browser.supported ) {
-                this.options.uploader = false;
-            }
-
-            // Initialize window-wide uploader.
-            if ( this.options.uploader ) {
-                this.uploader = new media.view.UploaderWindow({
-                    controller: this,
-                    uploader: {
-                        dropzone:  this.modal ? this.modal.$el : this.$el,
-                        container: this.$el
-                    }
-                });
-                this.views.set( '.media-frame-uploader', this.uploader );
-            }
-
-            this.on( 'attach', _.bind( this.views.ready, this.views ), this );
-
-            // Bind default title creation.
-            this.on( 'title:create:default', this.createTitle, this );
-            this.title.mode('default');
-
-            // Bind default menu.
-            this.on( 'menu:create:default', this.createMenu, this );
-        },
-        /**
-         * @returns {wp.media.view.MediaFrame} Returns itself to allow chaining
-         */
-        render: function() {
-            // Activate the default state if no active state exists.
-            if ( ! this.state() && this.options.state ) {
-                this.setState( this.options.state );
-            }
-            /**
-             * call 'render' directly on the parent class
-             */
-            return media.view.Frame.prototype.render.apply( this, arguments );
-        },
-        /**
-         * @param {Object} title
-         * @this wp.media.controller.Region
-         */
-        createTitle: function( title ) {
-            title.view = new media.View({
-                controller: this,
-                tagName: 'h1'
-            });
-        },
-        /**
-         * @param {Object} menu
-         * @this wp.media.controller.Region
-         */
-        createMenu: function( menu ) {
-            menu.view = new media.view.Menu({
-                controller: this
-            });
-        },
-        /**
-         * @param {Object} toolbar
-         * @this wp.media.controller.Region
-         */
-        createToolbar: function( toolbar ) {
-            toolbar.view = new media.view.Toolbar({
-                controller: this
-            });
-        },
-        /**
-         * @param {Object} router
-         * @this wp.media.controller.Region
-         */
-        createRouter: function( router ) {
-            router.view = new media.view.Router({
-                controller: this
-            });
-        },
-        /**
-         * @param {Object} options
-         */
-        createIframeStates: function( options ) {
-            var settings = media.view.settings,
-                tabs = settings.tabs,
-                tabUrl = settings.tabUrl,
-                $postId;
-
-            if ( ! tabs || ! tabUrl ) {
-                return;
-            }
-
-            // Add the post ID to the tab URL if it exists.
-            $postId = $('#post_ID');
-            if ( $postId.length ) {
-                tabUrl += '&post_id=' + $postId.val();
-            }
-
-            // Generate the tab states.
-            _.each( tabs, function( title, id ) {
-                this.state( 'iframe:' + id ).set( _.defaults({
-                    tab:     id,
-                    src:     tabUrl + '&tab=' + id,
-                    title:   title,
-                    content: 'iframe',
-                    menu:    'default'
-                }, options ) );
-            }, this );
-
-            this.on( 'content:create:iframe', this.iframeContent, this );
-            this.on( 'menu:render:default', this.iframeMenu, this );
-            this.on( 'open', this.hijackThickbox, this );
-            this.on( 'close', this.restoreThickbox, this );
-        },
-
-        /**
-         * @param {Object} content
-         * @this wp.media.controller.Region
-         */
-        iframeContent: function( content ) {
-            this.$el.addClass('hide-toolbar');
-            content.view = new media.view.Iframe({
-                controller: this
-            });
-        },
-
-        iframeMenu: function( view ) {
-            var views = {};
-
-            if ( ! view ) {
-                return;
-            }
-
-            _.each( media.view.settings.tabs, function( title, id ) {
-                views[ 'iframe:' + id ] = {
-                    text: this.state( 'iframe:' + id ).get('title'),
-                    priority: 200
-                };
-            }, this );
-
-            view.set( views );
-        },
-
-        hijackThickbox: function() {
-            var frame = this;
-
-            if ( ! window.tb_remove || this._tb_remove ) {
-                return;
-            }
-
-            this._tb_remove = window.tb_remove;
-            window.tb_remove = function() {
-                frame.close();
-                frame.reset();
-                frame.setState( frame.options.state );
-                frame._tb_remove.call( window );
-            };
-        },
-
-        restoreThickbox: function() {
-            if ( ! this._tb_remove ) {
-                return;
-            }
-
-            window.tb_remove = this._tb_remove;
-            delete this._tb_remove;
-        },
-
+        },
         /**
          * Map activeMode collection events to the frame.
@@ -1968 +1759 @@
             } );
 
-            if ( ! _.has( modeEventMap, collectionEvent ) )
+            if ( ! _.has( modeEventMap, collectionEvent ) ) {
                 return;
+            }
 
             eventToTrigger = model.get('id') + ':' + modeEventMap[collectionEvent];
@@ -1986 +1778 @@
             }
             this.activeModes.add( [ { id: mode } ] );
-            // Add a css class to the frame for anything that needs to be styled
-            // for the mode.
+            // Add a CSS class to the frame so elements can be styled for the mode.
             this.$el.addClass( 'mode-' + mode );
             /**
@@ -2028 +1819 @@
         isModeActive: function( mode ) {
             return Boolean( this.activeModes.where( { id: mode } ).length );
+        }
+    });
+
+    // Make the `Frame` a `StateMachine`.
+    _.extend( media.view.Frame.prototype, media.controller.StateMachine.prototype );
+
+    /**
+     * wp.media.view.MediaFrame
+     *
+     * Type of frame used to create the media modal.
+     *
+     * @constructor
+     * @augments wp.media.view.Frame
+     * @augments wp.media.View
+     * @augments wp.Backbone.View
+     * @augments Backbone.View
+     * @mixes wp.media.controller.StateMachine
+     */
+    media.view.MediaFrame = media.view.Frame.extend({
+        className: 'media-frame',
+        template:  media.template('media-frame'),
+        regions:   ['menu','title','content','toolbar','router'],
+
+        /**
+         * @global wp.Uploader
+         */
+        initialize: function() {
+            media.view.Frame.prototype.initialize.apply( this, arguments );
+
+            _.defaults( this.options, {
+                title:    '',
+                modal:    true,
+                uploader: true
+            });
+
+            // Ensure core UI is enabled.
+            this.$el.addClass('wp-core-ui');
+
+            // Initialize modal container view.
+            if ( this.options.modal ) {
+                this.modal = new media.view.Modal({
+                    controller: this,
+                    title:      this.options.title
+                });
+
+                this.modal.content( this );
+            }
+
+            // Force the uploader off if the upload limit has been exceeded or
+            // if the browser isn't supported.
+            if ( wp.Uploader.limitExceeded || ! wp.Uploader.browser.supported ) {
+                this.options.uploader = false;
+            }
+
+            // Initialize window-wide uploader.
+            if ( this.options.uploader ) {
+                this.uploader = new media.view.UploaderWindow({
+                    controller: this,
+                    uploader: {
+                        dropzone:  this.modal ? this.modal.$el : this.$el,
+                        container: this.$el
+                    }
+                });
+                this.views.set( '.media-frame-uploader', this.uploader );
+            }
+
+            this.on( 'attach', _.bind( this.views.ready, this.views ), this );
+
+            // Bind default title creation.
+            this.on( 'title:create:default', this.createTitle, this );
+            this.title.mode('default');
+
+            // Bind default menu.
+            this.on( 'menu:create:default', this.createMenu, this );
+        },
+        /**
+         * @returns {wp.media.view.MediaFrame} Returns itself to allow chaining
+         */
+        render: function() {
+            // Activate the default state if no active state exists.
+            if ( ! this.state() && this.options.state ) {
+                this.setState( this.options.state );
+            }
+            /**
+             * call 'render' directly on the parent class
+             */
+            return media.view.Frame.prototype.render.apply( this, arguments );
+        },
+        /**
+         * @param {Object} title
+         * @this wp.media.controller.Region
+         */
+        createTitle: function( title ) {
+            title.view = new media.View({
+                controller: this,
+                tagName: 'h1'
+            });
+        },
+        /**
+         * @param {Object} menu
+         * @this wp.media.controller.Region
+         */
+        createMenu: function( menu ) {
+            menu.view = new media.view.Menu({
+                controller: this
+            });
+        },
+        /**
+         * @param {Object} toolbar
+         * @this wp.media.controller.Region
+         */
+        createToolbar: function( toolbar ) {
+            toolbar.view = new media.view.Toolbar({
+                controller: this
+            });
+        },
+        /**
+         * @param {Object} router
+         * @this wp.media.controller.Region
+         */
+        createRouter: function( router ) {
+            router.view = new media.view.Router({
+                controller: this
+            });
+        },
+        /**
+         * @param {Object} options
+         */
+        createIframeStates: function( options ) {
+            var settings = media.view.settings,
+                tabs = settings.tabs,
+                tabUrl = settings.tabUrl,
+                $postId;
+
+            if ( ! tabs || ! tabUrl ) {
+                return;
+            }
+
+            // Add the post ID to the tab URL if it exists.
+            $postId = $('#post_ID');
+            if ( $postId.length ) {
+                tabUrl += '&post_id=' + $postId.val();
+            }
+
+            // Generate the tab states.
+            _.each( tabs, function( title, id ) {
+                this.state( 'iframe:' + id ).set( _.defaults({
+                    tab:     id,
+                    src:     tabUrl + '&tab=' + id,
+                    title:   title,
+                    content: 'iframe',
+                    menu:    'default'
+                }, options ) );
+            }, this );
+
+            this.on( 'content:create:iframe', this.iframeContent, this );
+            this.on( 'menu:render:default', this.iframeMenu, this );
+            this.on( 'open', this.hijackThickbox, this );
+            this.on( 'close', this.restoreThickbox, this );
+        },
+
+        /**
+         * @param {Object} content
+         * @this wp.media.controller.Region
+         */
+        iframeContent: function( content ) {
+            this.$el.addClass('hide-toolbar');
+            content.view = new media.view.Iframe({
+                controller: this
+            });
+        },
+
+        iframeMenu: function( view ) {
+            var views = {};
+
+            if ( ! view ) {
+                return;
+            }
+
+            _.each( media.view.settings.tabs, function( title, id ) {
+                views[ 'iframe:' + id ] = {
+                    text: this.state( 'iframe:' + id ).get('title'),
+                    priority: 200
+                };
+            }, this );
+
+            view.set( views );
+        },
+
+        hijackThickbox: function() {
+            var frame = this;
+
+            if ( ! window.tb_remove || this._tb_remove ) {
+                return;
+            }
+
+            this._tb_remove = window.tb_remove;
+            window.tb_remove = function() {
+                frame.close();
+                frame.reset();
+                frame.setState( frame.options.state );
+                frame._tb_remove.call( window );
+            };
+        },
+
+        restoreThickbox: function() {
+            if ( ! this._tb_remove ) {
+                return;
+            }
+
+            window.tb_remove = this._tb_remove;
+            delete this._tb_remove;
         }
     });
@@ -4632 +4635 @@
 
         initialize: function() {
-            var selection = this.options.selection;
-
-            this.$el.attr('aria-label', this.model.attributes.title).attr('aria-checked', false);
-            this.model.on( 'change', this.render, this );
+            var selection = this.options.selection,
+                options = _.defaults( this.options, {
+                    rerenderOnModelChange: true
+                } );
+            this.$el.attr( 'aria-label', this.model.get( 'title' ) ).attr( 'aria-checked', false );
+
+            if ( options.rerenderOnModelChange ) {
+                this.model.on( 'change', this.render, this );
+            }
             this.model.on( 'change:title', this._syncTitle, this );
             this.model.on( 'change:caption', this._syncCaption, this );
@@ -4647 +4655 @@
             if ( selection ) {
                 selection.on( 'reset', this.updateSelect, this );
-            }
-
-            // Update the model's details view.
-            this.model.on( 'selection:single selection:unsingle', this.details, this );
-            this.details( this.model, this.controller.state().get('selection') );
+                // Update the model's details view.
+                this.model.on( 'selection:single selection:unsingle', this.details, this );
+                this.details( this.model, this.controller.state().get('selection') );
+            }
         },
         /**
@@ -4753 +4760 @@
 
             // In the grid view, bubble up an edit:attachment event to the controller.
-            if ( this.controller.activeModes.where( { id: 'edit' } ).length ) {
+            if ( this.controller.isModeActive( 'grid' ) ) {
                 this.controller.trigger( 'edit:attachment', this.model );
                 return;
@@ -6319 +6326 @@
 
         initialize: function() {
+            this.options = _.defaults( this.options, {
+                rerenderOnModelChange: false
+            });
             /**
              * call 'initialize' directly on the parent class
              */
             media.view.Attachment.prototype.initialize.apply( this, arguments );
-        },
-        /**
-         * @returns {wp.media.view..Attachment.Details} Returns itself to allow chaining
-         */
-        render: function() {
-            /**
-             * call 'render' directly on the parent class
-             */
-            media.view.Attachment.prototype.render.apply( this, arguments );
-            return this;
         },
         /**
@@ -6380 +6380 @@
         },
         /**
+         * When reverse tabbing(shift+tab) out of the right details panel, deliver
+         * the focus to the item in the list that was being edited.
+         *
          * @param {Object} event
          */
         toggleSelectionHandler: function( event ) {
-            // Reverse tabbing out of the right details panel
-            // should take me back to the item in the list that was being edited.
             if ( 'keydown' === event.type && 9 === event.keyCode && event.shiftKey && event.target === $( ':tabbable', this.$el ).filter( ':first' )[0] ) {
                 $('.attachments-browser .details').focus();

trunk/src/wp-includes/media-template.php

@@ -264 +264 @@
 
     <script type="text/html" id="tmpl-attachment-details-two-column">
-        <h3>
-            <?php _e('Attachment Details'); ?>
-        </h3>
         <div class="attachment-media-view">
             <div class="thumbnail thumbnail-{{ data.type }}">
@@ -295 +292 @@
                 <div class="attachment-actions">
                     <# if ( 'image' === data.type && ! data.uploading ) { #>
-                        <a class="button edit-image" href="#"><?php _e( 'Edit Image' ); ?></a>
+                        <a class="button edit-attachment" href="#"><?php _e( 'Edit Image' ); ?></a>
                     <# } #>