Changeset 46499

Timestamp:

10/14/2019 07:11:50 PM (6 years ago)

Author:

whyisjake

Message:

Backporting several bug fixes.

• Query: Remove the static query property.
• HTTP API: Protect against hex interpretation.
• Filesystem API: Prevent directory travelersals when creating new folders.
• Administration: Ensure that admin referer nonce is valid.
• REST API: Send a Vary: Origin header on GET requests.
• Customizer: Properly sanitize background images.

Backports [46474], [46475], [46476], [46477], [46478], [46483], [46485] to the 4.3 branch.

Location:

branches/4.3

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp.php (modified) (1 diff)
• src/wp-includes/functions.php (modified) (1 diff)
• src/wp-includes/http.php (modified) (1 diff)
• src/wp-includes/js/media-views.js (modified) (28 diffs)
• src/wp-includes/pluggable.php (modified) (4 diffs)
• src/wp-includes/query.php (modified) (2 diffs)
• tests/phpunit/tests/auth.php (modified) (1 diff)

branches/4.3/src/wp-includes/class-wp.php

@@ -16 +16 @@
      * @var array
      */
-    public $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'comments_popup', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots', 'taxonomy', 'term', 'cpage', 'post_type');
+    public $public_query_vars = array( 'm', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'pagename', 'page_id', 'error', 'comments_popup', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots', 'taxonomy', 'term', 'cpage', 'post_type', 'embed' );
 
     /**

branches/4.3/src/wp-includes/functions.php

@@ -1507 +1507 @@
     if ( file_exists( $target ) )
         return @is_dir( $target );
+
+    // Do not allow path traversals.
+    if ( false !== strpos( $target, '../' ) || false !== strpos( $target, '..' . DIRECTORY_SEPARATOR ) ) {
+        return false;
+    }
 
     // We need to find the permissions of the parent folder that exists and inherit that.

branches/4.3/src/wp-includes/http.php

@@ -474 +474 @@
         } else {
             $ip = gethostbyname( $host );
-            if ( $ip === $host ) // Error condition for gethostbyname()
-                $ip = false;
+            if ( $ip === $host ) { // Error condition for gethostbyname()
+                return false;
+            }
         }
         if ( $ip ) {

branches/4.3/src/wp-includes/js/media-views.js

@@ -1 @@
-(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+/******/ (function(modules) { // webpackBootstrap
+/******/    // The module cache
+/******/    var installedModules = {};
+/******/
+/******/    // The require function
+/******/    function __webpack_require__(moduleId) {
+/******/
+/******/        // Check if module is in cache
+/******/        if(installedModules[moduleId]) {
+/******/            return installedModules[moduleId].exports;
+/******/        }
+/******/        // Create a new module (and put it into the cache)
+/******/        var module = installedModules[moduleId] = {
+/******/            i: moduleId,
+/******/            l: false,
+/******/            exports: {}
+/******/        };
+/******/
+/******/        // Execute the module function
+/******/        modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/        // Flag the module as loaded
+/******/        module.l = true;
+/******/
+/******/        // Return the exports of the module
+/******/        return module.exports;
+/******/    }
+/******/
+/******/
+/******/    // expose the modules object (__webpack_modules__)
+/******/    __webpack_require__.m = modules;
+/******/
+/******/    // expose the module cache
+/******/    __webpack_require__.c = installedModules;
+/******/
+/******/    // define getter function for harmony exports
+/******/    __webpack_require__.d = function(exports, name, getter) {
+/******/        if(!__webpack_require__.o(exports, name)) {
+/******/            Object.defineProperty(exports, name, {
+/******/                configurable: false,
+/******/                enumerable: true,
+/******/                get: getter
+/******/            });
+/******/        }
+/******/    };
+/******/
+/******/    // getDefaultExport function for compatibility with non-harmony modules
+/******/    __webpack_require__.n = function(module) {
+/******/        var getter = module && module.__esModule ?
+/******/            function getDefault() { return module['default']; } :
+/******/            function getModuleExports() { return module; };
+/******/        __webpack_require__.d(getter, 'a', getter);
+/******/        return getter;
+/******/    };
+/******/
+/******/    // Object.prototype.hasOwnProperty.call
+/******/    __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/    // __webpack_public_path__
+/******/    __webpack_require__.p = "";
+/******/
+/******/    // Load entry module and return exports
+/******/    return __webpack_require__(__webpack_require__.s = 26);
+/******/ })
+/************************************************************************/
+/******/ (Array(26).concat([
+/* 26 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var media = wp.media,
+    $ = jQuery,
+    l10n;
+
+media.isTouchDevice = ( 'ontouchend' in document );
+
+// Link any localized strings.
+l10n = media.view.l10n = window._wpMediaViewsL10n || {};
+
+// Link any settings.
+media.view.settings = l10n.settings || {};
+delete l10n.settings;
+
+// Copy the `post` setting over to the model settings.
+media.model.settings.post = media.view.settings.post;
+
+// Check if the browser supports CSS 3.0 transitions
+$.support.transition = (function(){
+    var style = document.documentElement.style,
+        transitions = {
+            WebkitTransition: 'webkitTransitionEnd',
+            MozTransition:    'transitionend',
+            OTransition:      'oTransitionEnd otransitionend',
+            transition:       'transitionend'
+        }, transition;
+
+    transition = _.find( _.keys( transitions ), function( transition ) {
+        return ! _.isUndefined( style[ transition ] );
+    });
+
+    return transition && {
+        end: transitions[ transition ]
+    };
+}());
+
 /**
- * wp.media.controller.CollectionAdd
- *
- * A state for adding attachments to a collection (e.g. video playlist).
+ * A shared event bus used to provide events into
+ * the media workflows that 3rd-party devs can use to hook
+ * in.
+ */
+media.events = _.extend( {}, Backbone.Events );
+
+/**
+ * Makes it easier to bind events using transitions.
+ *
+ * @param {string} selector
+ * @param {Number} sensitivity
+ * @returns {Promise}
+ */
+media.transition = function( selector, sensitivity ) {
+    var deferred = $.Deferred();
+
+    sensitivity = sensitivity || 2000;
+
+    if ( $.support.transition ) {
+        if ( ! (selector instanceof $) ) {
+            selector = $( selector );
+        }
+
+        // Resolve the deferred when the first element finishes animating.
+        selector.first().one( $.support.transition.end, deferred.resolve );
+
+        // Just in case the event doesn't trigger, fire a callback.
+        _.delay( deferred.resolve, sensitivity );
+
+    // Otherwise, execute on the spot.
+    } else {
+        deferred.resolve();
+    }
+
+    return deferred.promise();
+};
+
+media.controller.Region = __webpack_require__( 27 );
+media.controller.StateMachine = __webpack_require__( 28 );
+media.controller.State = __webpack_require__( 29 );
+
+media.selectionSync = __webpack_require__( 30 );
+media.controller.Library = __webpack_require__( 31 );
+media.controller.ImageDetails = __webpack_require__( 32 );
+media.controller.GalleryEdit = __webpack_require__( 33 );
+media.controller.GalleryAdd = __webpack_require__( 34 );
+media.controller.CollectionEdit = __webpack_require__( 35 );
+media.controller.CollectionAdd = __webpack_require__( 36 );
+media.controller.FeaturedImage = __webpack_require__( 37 );
+media.controller.ReplaceImage = __webpack_require__( 38 );
+media.controller.EditImage = __webpack_require__( 39 );
+media.controller.MediaLibrary = __webpack_require__( 40 );
+media.controller.Embed = __webpack_require__( 41 );
+media.controller.Cropper = __webpack_require__( 42 );
+media.controller.CustomizeImageCropper = __webpack_require__( 43 );
+media.controller.SiteIconCropper = __webpack_require__( 44 );
+
+media.View = __webpack_require__( 45 );
+media.view.Frame = __webpack_require__( 46 );
+media.view.MediaFrame = __webpack_require__( 47 );
+media.view.MediaFrame.Select = __webpack_require__( 48 );
+media.view.MediaFrame.Post = __webpack_require__( 49 );
+media.view.MediaFrame.ImageDetails = __webpack_require__( 50 );
+media.view.Modal = __webpack_require__( 51 );
+media.view.FocusManager = __webpack_require__( 52 );
+media.view.UploaderWindow = __webpack_require__( 53 );
+media.view.EditorUploader = __webpack_require__( 54 );
+media.view.UploaderInline = __webpack_require__( 55 );
+media.view.UploaderStatus = __webpack_require__( 56 );
+media.view.UploaderStatusError = __webpack_require__( 57 );
+media.view.Toolbar = __webpack_require__( 58 );
+media.view.Toolbar.Select = __webpack_require__( 59 );
+media.view.Toolbar.Embed = __webpack_require__( 60 );
+media.view.Button = __webpack_require__( 61 );
+media.view.ButtonGroup = __webpack_require__( 62 );
+media.view.PriorityList = __webpack_require__( 63 );
+media.view.MenuItem = __webpack_require__( 64 );
+media.view.Menu = __webpack_require__( 65 );
+media.view.RouterItem = __webpack_require__( 66 );
+media.view.Router = __webpack_require__( 67 );
+media.view.Sidebar = __webpack_require__( 68 );
+media.view.Attachment = __webpack_require__( 69 );
+media.view.Attachment.Library = __webpack_require__( 70 );
+media.view.Attachment.EditLibrary = __webpack_require__( 71 );
+media.view.Attachments = __webpack_require__( 72 );
+media.view.Search = __webpack_require__( 73 );
+media.view.AttachmentFilters = __webpack_require__( 74 );
+media.view.DateFilter = __webpack_require__( 75 );
+media.view.AttachmentFilters.Uploaded = __webpack_require__( 76 );
+media.view.AttachmentFilters.All = __webpack_require__( 77 );
+media.view.AttachmentsBrowser = __webpack_require__( 78 );
+media.view.Selection = __webpack_require__( 79 );
+media.view.Attachment.Selection = __webpack_require__( 80 );
+media.view.Attachments.Selection = __webpack_require__( 81 );
+media.view.Attachment.EditSelection = __webpack_require__( 82 );
+media.view.Settings = __webpack_require__( 83 );
+media.view.Settings.AttachmentDisplay = __webpack_require__( 84 );
+media.view.Settings.Gallery = __webpack_require__( 85 );
+media.view.Settings.Playlist = __webpack_require__( 86 );
+media.view.Attachment.Details = __webpack_require__( 87 );
+media.view.AttachmentCompat = __webpack_require__( 88 );
+media.view.Iframe = __webpack_require__( 89 );
+media.view.Embed = __webpack_require__( 90 );
+media.view.Label = __webpack_require__( 91 );
+media.view.EmbedUrl = __webpack_require__( 92 );
+media.view.EmbedLink = __webpack_require__( 93 );
+media.view.EmbedImage = __webpack_require__( 94 );
+media.view.ImageDetails = __webpack_require__( 95 );
+media.view.Cropper = __webpack_require__( 96 );
+media.view.SiteIconCropper = __webpack_require__( 97 );
+media.view.SiteIconPreview = __webpack_require__( 98 );
+media.view.EditImage = __webpack_require__( 99 );
+media.view.Spinner = __webpack_require__( 100 );
+
+
+/***/ }),
+/* 27 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.controller.Region
+ *
+ * A region is a persistent application layout area.
+ *
+ * A region assumes one mode at any time, and can be switched to another.
+ *
+ * When mode changes, events are triggered on the region's parent view.
+ * The parent view will listen to specific events and fill the region with an
+ * appropriate view depending on mode. For example, a frame listens for the
+ * 'browse' mode t be activated on the 'content' view and then fills the region
+ * with an AttachmentsBrowser view.
+ *
+ * @class
+ *
+ * @param {object}        options          Options hash for the region.
+ * @param {string}        options.id       Unique identifier for the region.
+ * @param {Backbone.View} options.view     A parent view the region exists within.
+ * @param {string}        options.selector jQuery selector for the region within the parent view.
+ */
+var Region = function( options ) {
+    _.extend( this, _.pick( options || {}, 'id', 'view', 'selector' ) );
+};
+
+// Use Backbone's self-propagating `extend` inheritance method.
+Region.extend = Backbone.Model.extend;
+
+_.extend( Region.prototype, {
+    /**
+     * Activate a mode.
+     *
+     * @since 3.5.0
+     *
+     * @param {string} mode
+     *
+     * @fires this.view#{this.id}:activate:{this._mode}
+     * @fires this.view#{this.id}:activate
+     * @fires this.view#{this.id}:deactivate:{this._mode}
+     * @fires this.view#{this.id}:deactivate
+     *
+     * @returns {wp.media.controller.Region} Returns itself to allow chaining.
+     */
+    mode: function( mode ) {
+        if ( ! mode ) {
+            return this._mode;
+        }
+        // Bail if we're trying to change to the current mode.
+        if ( mode === this._mode ) {
+            return this;
+        }
+
+        /**
+         * Region mode deactivation event.
+         *
+         * @event this.view#{this.id}:deactivate:{this._mode}
+         * @event this.view#{this.id}:deactivate
+         */
+        this.trigger('deactivate');
+
+        this._mode = mode;
+        this.render( mode );
+
+        /**
+         * Region mode activation event.
+         *
+         * @event this.view#{this.id}:activate:{this._mode}
+         * @event this.view#{this.id}:activate
+         */
+        this.trigger('activate');
+        return this;
+    },
+    /**
+     * Render a mode.
+     *
+     * @since 3.5.0
+     *
+     * @param {string} mode
+     *
+     * @fires this.view#{this.id}:create:{this._mode}
+     * @fires this.view#{this.id}:create
+     * @fires this.view#{this.id}:render:{this._mode}
+     * @fires this.view#{this.id}:render
+     *
+     * @returns {wp.media.controller.Region} Returns itself to allow chaining
+     */
+    render: function( mode ) {
+        // If the mode isn't active, activate it.
+        if ( mode && mode !== this._mode ) {
+            return this.mode( mode );
+        }
+
+        var set = { view: null },
+            view;
+
+        /**
+         * Create region view event.
+         *
+         * Region view creation takes place in an event callback on the frame.
+         *
+         * @event this.view#{this.id}:create:{this._mode}
+         * @event this.view#{this.id}:create
+         */
+        this.trigger( 'create', set );
+        view = set.view;
+
+        /**
+         * Render region view event.
+         *
+         * Region view creation takes place in an event callback on the frame.
+         *
+         * @event this.view#{this.id}:create:{this._mode}
+         * @event this.view#{this.id}:create
+         */
+        this.trigger( 'render', view );
+        if ( view ) {
+            this.set( view );
+        }
+        return this;
+    },
+
+    /**
+     * Get the region's view.
+     *
+     * @since 3.5.0
+     *
+     * @returns {wp.media.View}
+     */
+    get: function() {
+        return this.view.views.first( this.selector );
+    },
+
+    /**
+     * Set the region's view as a subview of the frame.
+     *
+     * @since 3.5.0
+     *
+     * @param {Array|Object} views
+     * @param {Object} [options={}]
+     * @returns {wp.Backbone.Subviews} Subviews is returned to allow chaining
+     */
+    set: function( views, options ) {
+        if ( options ) {
+            options.add = false;
+        }
+        return this.view.views.set( this.selector, views, options );
+    },
+
+    /**
+     * Trigger regional view events on the frame.
+     *
+     * @since 3.5.0
+     *
+     * @param {string} event
+     * @returns {undefined|wp.media.controller.Region} Returns itself to allow chaining.
+     */
+    trigger: function( event ) {
+        var base, args;
+
+        if ( ! this._mode ) {
+            return;
+        }
+
+        args = _.toArray( arguments );
+        base = this.id + ':' + event;
+
+        // Trigger `{this.id}:{event}:{this._mode}` event on the frame.
+        args[0] = base + ':' + this._mode;
+        this.view.trigger.apply( this.view, args );
+
+        // Trigger `{this.id}:{event}` event on the frame.
+        args[0] = base;
+        this.view.trigger.apply( this.view, args );
+        return this;
+    }
+});
+
+module.exports = Region;
+
+
+/***/ }),
+/* 28 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.controller.StateMachine
+ *
+ * A state machine keeps track of state. It is in one state at a time,
+ * and can change from one state to another.
+ *
+ * States are stored as models in a Backbone collection.
+ *
+ * @since 3.5.0
+ *
+ * @class
+ * @augments Backbone.Model
+ * @mixin
+ * @mixes Backbone.Events
+ *
+ * @param {Array} states
+ */
+var StateMachine = function( states ) {
+    // @todo This is dead code. The states collection gets created in media.view.Frame._createStates.
+    this.states = new Backbone.Collection( states );
+};
+
+// Use Backbone's self-propagating `extend` inheritance method.
+StateMachine.extend = Backbone.Model.extend;
+
+_.extend( StateMachine.prototype, Backbone.Events, {
+    /**
+     * Fetch a state.
+     *
+     * If no `id` is provided, returns the active state.
+     *
+     * Implicitly creates states.
+     *
+     * Ensure that the `states` collection exists so the `StateMachine`
+     *   can be used as a mixin.
+     *
+     * @since 3.5.0
+     *
+     * @param {string} id
+     * @returns {wp.media.controller.State} Returns a State model
+     *   from the StateMachine collection
+     */
+    state: function( id ) {
+        this.states = this.states || new Backbone.Collection();
+
+        // Default to the active state.
+        id = id || this._state;
+
+        if ( id && ! this.states.get( id ) ) {
+            this.states.add({ id: id });
+        }
+        return this.states.get( id );
+    },
+
+    /**
+     * Sets the active state.
+     *
+     * Bail if we're trying to select the current state, if we haven't
+     * created the `states` collection, or are trying to select a state
+     * that does not exist.
+     *
+     * @since 3.5.0
+     *
+     * @param {string} id
+     *
+     * @fires wp.media.controller.State#deactivate
+     * @fires wp.media.controller.State#activate
+     *
+     * @returns {wp.media.controller.StateMachine} Returns itself to allow chaining
+     */
+    setState: function( id ) {
+        var previous = this.state();
+
+        if ( ( previous && id === previous.id ) || ! this.states || ! this.states.get( id ) ) {
+            return this;
+        }
+
+        if ( previous ) {
+            previous.trigger('deactivate');
+            this._lastState = previous.id;
+        }
+
+        this._state = id;
+        this.state().trigger('activate');
+
+        return this;
+    },
+
+    /**
+     * Returns the previous active state.
+     *
+     * Call the `state()` method with no parameters to retrieve the current
+     * active state.
+     *
+     * @since 3.5.0
+     *
+     * @returns {wp.media.controller.State} Returns a State model
+     *    from the StateMachine collection
+     */
+    lastState: function() {
+        if ( this._lastState ) {
+            return this.state( this._lastState );
+        }
+    }
+});
+
+// Map all event binding and triggering on a StateMachine to its `states` collection.
+_.each([ 'on', 'off', 'trigger' ], function( method ) {
+    /**
+     * @returns {wp.media.controller.StateMachine} Returns itself to allow chaining.
+     */
+    StateMachine.prototype[ method ] = function() {
+        // Ensure that the `states` collection exists so the `StateMachine`
+        // can be used as a mixin.
+        this.states = this.states || new Backbone.Collection();
+        // Forward the method to the `states` collection.
+        this.states[ method ].apply( this.states, arguments );
+        return this;
+    };
+});
+
+module.exports = StateMachine;
+
+
+/***/ }),
+/* 29 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.controller.State
+ *
+ * A state is a step in a workflow that when set will trigger the controllers
+ * for the regions to be updated as specified in the frame.
+ *
+ * A state has an event-driven lifecycle:
+ *
+ *     'ready'      triggers when a state is added to a state machine's collection.
+ *     'activate'   triggers when a state is activated by a state machine.
+ *     'deactivate' triggers when a state is deactivated by a state machine.
+ *     'reset'      is not triggered automatically. It should be invoked by the
+ *                  proper controller to reset the state to its default.
+ *
+ * @class
+ * @augments Backbone.Model
+ */
+var State = Backbone.Model.extend({
+    /**
+     * Constructor.
+     *
+     * @since 3.5.0
+     */
+    constructor: function() {
+        this.on( 'activate', this._preActivate, this );
+        this.on( 'activate', this.activate, this );
+        this.on( 'activate', this._postActivate, this );
+        this.on( 'deactivate', this._deactivate, this );
+        this.on( 'deactivate', this.deactivate, this );
+        this.on( 'reset', this.reset, this );
+        this.on( 'ready', this._ready, this );
+        this.on( 'ready', this.ready, this );
+        /**
+         * Call parent constructor with passed arguments
+         */
+        Backbone.Model.apply( this, arguments );
+        this.on( 'change:menu', this._updateMenu, this );
+    },
+    /**
+     * Ready event callback.
+     *
+     * @abstract
+     * @since 3.5.0
+     */
+    ready: function() {},
+
+    /**
+     * Activate event callback.
+     *
+     * @abstract
+     * @since 3.5.0
+     */
+    activate: function() {},
+
+    /**
+     * Deactivate event callback.
+     *
+     * @abstract
+     * @since 3.5.0
+     */
+    deactivate: function() {},
+
+    /**
+     * Reset event callback.
+     *
+     * @abstract
+     * @since 3.5.0
+     */
+    reset: function() {},
+
+    /**
+     * @access private
+     * @since 3.5.0
+     */
+    _ready: function() {
+        this._updateMenu();
+    },
+
+    /**
+     * @access private
+     * @since 3.5.0
+    */
+    _preActivate: function() {
+        this.active = true;
+    },
+
+    /**
+     * @access private
+     * @since 3.5.0
+     */
+    _postActivate: function() {
+        this.on( 'change:menu', this._menu, this );
+        this.on( 'change:titleMode', this._title, this );
+        this.on( 'change:content', this._content, this );
+        this.on( 'change:toolbar', this._toolbar, this );
+
+        this.frame.on( 'title:render:default', this._renderTitle, this );
+
+        this._title();
+        this._menu();
+        this._toolbar();
+        this._content();
+        this._router();
+    },
+
+    /**
+     * @access private
+     * @since 3.5.0
+     */
+    _deactivate: function() {
+        this.active = false;
+
+        this.frame.off( 'title:render:default', this._renderTitle, this );
+
+        this.off( 'change:menu', this._menu, this );
+        this.off( 'change:titleMode', this._title, this );
+        this.off( 'change:content', this._content, this );
+        this.off( 'change:toolbar', this._toolbar, this );
+    },
+
+    /**
+     * @access private
+     * @since 3.5.0
+     */
+    _title: function() {
+        this.frame.title.render( this.get('titleMode') || 'default' );
+    },
+
+    /**
+     * @access private
+     * @since 3.5.0
+     */
+    _renderTitle: function( view ) {
+        view.$el.text( this.get('title') || '' );
+    },
+
+    /**
+     * @access private
+     * @since 3.5.0
+     */
+    _router: function() {
+        var router = this.frame.router,
+            mode = this.get('router'),
+            view;
+
+        this.frame.$el.toggleClass( 'hide-router', ! mode );
+        if ( ! mode ) {
+            return;
+        }
+
+        this.frame.router.render( mode );
+
+        view = router.get();
+        if ( view && view.select ) {
+            view.select( this.frame.content.mode() );
+        }
+    },
+
+    /**
+     * @access private
+     * @since 3.5.0
+     */
+    _menu: function() {
+        var menu = this.frame.menu,
+            mode = this.get('menu'),
+            view;
+
+        this.frame.$el.toggleClass( 'hide-menu', ! mode );
+        if ( ! mode ) {
+            return;
+        }
+
+        menu.mode( mode );
+
+        view = menu.get();
+        if ( view && view.select ) {
+            view.select( this.id );
+        }
+    },
+
+    /**
+     * @access private
+     * @since 3.5.0
+     */
+    _updateMenu: function() {
+        var previous = this.previous('menu'),
+            menu = this.get('menu');
+
+        if ( previous ) {
+            this.frame.off( 'menu:render:' + previous, this._renderMenu, this );
+        }
+
+        if ( menu ) {
+            this.frame.on( 'menu:render:' + menu, this._renderMenu, this );
+        }
+    },
+
+    /**
+     * Create a view in the media menu for the state.
+     *
+     * @access private
+     * @since 3.5.0
+     *
+     * @param {media.view.Menu} view The menu view.
+     */
+    _renderMenu: function( view ) {
+        var menuItem = this.get('menuItem'),
+            title = this.get('title'),
+            priority = this.get('priority');
+
+        if ( ! menuItem && title ) {
+            menuItem = { text: title };
+
+            if ( priority ) {
+                menuItem.priority = priority;
+            }
+        }
+
+        if ( ! menuItem ) {
+            return;
+        }
+
+        view.set( this.id, menuItem );
+    }
+});
+
+_.each(['toolbar','content'], function( region ) {
+    /**
+     * @access private
+     */
+    State.prototype[ '_' + region ] = function() {
+        var mode = this.get( region );
+        if ( mode ) {
+            this.frame[ region ].render( mode );
+        }
+    };
+});
+
+module.exports = State;
+
+
+/***/ }),
+/* 30 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.selectionSync
+ *
+ * Sync an attachments selection in a state with another state.
+ *
+ * Allows for selecting multiple images in the Insert Media workflow, and then
+ * switching to the Insert Gallery workflow while preserving the attachments selection.
+ *
+ * @mixin
+ */
+var selectionSync = {
+    /**
+     * @since 3.5.0
+     */
+    syncSelection: function() {
+        var selection = this.get('selection'),
+            manager = this.frame._selection;
+
+        if ( ! this.get('syncSelection') || ! manager || ! selection ) {
+            return;
+        }
+
+        // If the selection supports multiple items, validate the stored
+        // attachments based on the new selection's conditions. Record
+        // the attachments that are not included; we'll maintain a
+        // reference to those. Other attachments are considered in flux.
+        if ( selection.multiple ) {
+            selection.reset( [], { silent: true });
+            selection.validateAll( manager.attachments );
+            manager.difference = _.difference( manager.attachments.models, selection.models );
+        }
+
+        // Sync the selection's single item with the master.
+        selection.single( manager.single );
+    },
+
+    /**
+     * Record the currently active attachments, which is a combination
+     * of the selection's attachments and the set of selected
+     * attachments that this specific selection considered invalid.
+     * Reset the difference and record the single attachment.
+     *
+     * @since 3.5.0
+     */
+    recordSelection: function() {
+        var selection = this.get('selection'),
+            manager = this.frame._selection;
+
+        if ( ! this.get('syncSelection') || ! manager || ! selection ) {
+            return;
+        }
+
+        if ( selection.multiple ) {
+            manager.attachments.reset( selection.toArray().concat( manager.difference ) );
+            manager.difference = [];
+        } else {
+            manager.attachments.add( selection.toArray() );
+        }
+
+        manager.single = selection._single;
+    }
+};
+
+module.exports = selectionSync;
+
+
+/***/ }),
+/* 31 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.controller.Library
+ *
+ * A state for choosing an attachment or group of attachments from the media library.
+ *
+ * @class
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ * @mixes media.selectionSync
+ *
+ * @param {object}                          [attributes]                         The attributes hash passed to the state.
+ * @param {string}                          [attributes.id=library]              Unique identifier.
+ * @param {string}                          [attributes.title=Media library]     Title for the state. Displays in the media menu and the frame's title region.
+ * @param {wp.media.model.Attachments}      [attributes.library]                 The attachments collection to browse.
+ *                                                                               If one is not supplied, a collection of all attachments will be created.
+ * @param {wp.media.model.Selection|object} [attributes.selection]               A collection to contain attachment selections within the state.
+ *                                                                               If the 'selection' attribute is a plain JS object,
+ *                                                                               a Selection will be created using its values as the selection instance's `props` model.
+ *                                                                               Otherwise, it will copy the library's `props` model.
+ * @param {boolean}                         [attributes.multiple=false]          Whether multi-select is enabled.
+ * @param {string}                          [attributes.content=upload]          Initial mode for the content region.
+ *                                                                               Overridden by persistent user setting if 'contentUserSetting' is true.
+ * @param {string}                          [attributes.menu=default]            Initial mode for the menu region.
+ * @param {string}                          [attributes.router=browse]           Initial mode for the router region.
+ * @param {string}                          [attributes.toolbar=select]          Initial mode for the toolbar region.
+ * @param {boolean}                         [attributes.searchable=true]         Whether the library is searchable.
+ * @param {boolean|string}                  [attributes.filterable=false]        Whether the library is filterable, and if so what filters should be shown.
+ *                                                                               Accepts 'all', 'uploaded', or 'unattached'.
+ * @param {boolean}                         [attributes.sortable=true]           Whether the Attachments should be sortable. Depends on the orderby property being set to menuOrder on the attachments collection.
+ * @param {boolean}                         [attributes.autoSelect=true]         Whether an uploaded attachment should be automatically added to the selection.
+ * @param {boolean}                         [attributes.describe=false]          Whether to offer UI to describe attachments - e.g. captioning images in a gallery.
+ * @param {boolean}                         [attributes.contentUserSetting=true] Whether the content region's mode should be set and persisted per user.
+ * @param {boolean}                         [attributes.syncSelection=true]      Whether the Attachments selection should be persisted from the last state.
+ */
+var l10n = wp.media.view.l10n,
+    getUserSetting = window.getUserSetting,
+    setUserSetting = window.setUserSetting,
+    Library;
+
+Library = wp.media.controller.State.extend({
+    defaults: {
+        id:                 'library',
+        title:              l10n.mediaLibraryTitle,
+        multiple:           false,
+        content:            'upload',
+        menu:               'default',
+        router:             'browse',
+        toolbar:            'select',
+        searchable:         true,
+        filterable:         false,
+        sortable:           true,
+        autoSelect:         true,
+        describe:           false,
+        contentUserSetting: true,
+        syncSelection:      true
+    },
+
+    /**
+     * If a library isn't provided, query all media items.
+     * If a selection instance isn't provided, create one.
+     *
+     * @since 3.5.0
+     */
+    initialize: function() {
+        var selection = this.get('selection'),
+            props;
+
+        if ( ! this.get('library') ) {
+            this.set( 'library', wp.media.query() );
+        }
+
+        if ( ! ( selection instanceof wp.media.model.Selection ) ) {
+            props = selection;
+
+            if ( ! props ) {
+                props = this.get('library').props.toJSON();
+                props = _.omit( props, 'orderby', 'query' );
+            }
+
+            this.set( 'selection', new wp.media.model.Selection( null, {
+                multiple: this.get('multiple'),
+                props: props
+            }) );
+        }
+
+        this.resetDisplays();
+    },
+
+    /**
+     * @since 3.5.0
+     */
+    activate: function() {
+        this.syncSelection();
+
+        wp.Uploader.queue.on( 'add', this.uploading, this );
+
+        this.get('selection').on( 'add remove reset', this.refreshContent, this );
+
+        if ( this.get( 'router' ) && this.get('contentUserSetting') ) {
+            this.frame.on( 'content:activate', this.saveContentMode, this );
+            this.set( 'content', getUserSetting( 'libraryContent', this.get('content') ) );
+        }
+    },
+
+    /**
+     * @since 3.5.0
+     */
+    deactivate: function() {
+        this.recordSelection();
+
+        this.frame.off( 'content:activate', this.saveContentMode, this );
+
+        // Unbind all event handlers that use this state as the context
+        // from the selection.
+        this.get('selection').off( null, null, this );
+
+        wp.Uploader.queue.off( null, null, this );
+    },
+
+    /**
+     * Reset the library to its initial state.
+     *
+     * @since 3.5.0
+     */
+    reset: function() {
+        this.get('selection').reset();
+        this.resetDisplays();
+        this.refreshContent();
+    },
+
+    /**
+     * Reset the attachment display settings defaults to the site options.
+     *
+     * If site options don't define them, fall back to a persistent user setting.
+     *
+     * @since 3.5.0
+     */
+    resetDisplays: function() {
+        var defaultProps = wp.media.view.settings.defaultProps;
+        this._displays = [];
+        this._defaultDisplaySettings = {
+            align: defaultProps.align || getUserSetting( 'align', 'none' ),
+            size:  defaultProps.size  || getUserSetting( 'imgsize', 'medium' ),
+            link:  defaultProps.link  || getUserSetting( 'urlbutton', 'file' )
+        };
+    },
+
+    /**
+     * Create a model to represent display settings (alignment, etc.) for an attachment.
+     *
+     * @since 3.5.0
+     *
+     * @param {wp.media.model.Attachment} attachment
+     * @returns {Backbone.Model}
+     */
+    display: function( attachment ) {
+        var displays = this._displays;
+
+        if ( ! displays[ attachment.cid ] ) {
+            displays[ attachment.cid ] = new Backbone.Model( this.defaultDisplaySettings( attachment ) );
+        }
+        return displays[ attachment.cid ];
+    },
+
+    /**
+     * Given an attachment, create attachment display settings properties.
+     *
+     * @since 3.6.0
+     *
+     * @param {wp.media.model.Attachment} attachment
+     * @returns {Object}
+     */
+    defaultDisplaySettings: function( attachment ) {
+        var settings = this._defaultDisplaySettings;
+        if ( settings.canEmbed = this.canEmbed( attachment ) ) {
+            settings.link = 'embed';
+        }
+        return settings;
+    },
+
+    /**
+     * Whether an attachment can be embedded (audio or video).
+     *
+     * @since 3.6.0
+     *
+     * @param {wp.media.model.Attachment} attachment
+     * @returns {Boolean}
+     */
+    canEmbed: function( attachment ) {
+        // If uploading, we know the filename but not the mime type.
+        if ( ! attachment.get('uploading') ) {
+            var type = attachment.get('type');
+            if ( type !== 'audio' && type !== 'video' ) {
+                return false;
+            }
+        }
+
+        return _.contains( wp.media.view.settings.embedExts, attachment.get('filename').split('.').pop() );
+    },
+
+
+    /**
+     * If the state is active, no items are selected, and the current
+     * content mode is not an option in the state's router (provided
+     * the state has a router), reset the content mode to the default.
+     *
+     * @since 3.5.0
+     */
+    refreshContent: function() {
+        var selection = this.get('selection'),
+            frame = this.frame,
+            router = frame.router.get(),
+            mode = frame.content.mode();
+
+        if ( this.active && ! selection.length && router && ! router.get( mode ) ) {
+            this.frame.content.render( this.get('content') );
+        }
+    },
+
+    /**
+     * Callback handler when an attachment is uploaded.
+     *
+     * Switch to the Media Library if uploaded from the 'Upload Files' tab.
+     *
+     * Adds any uploading attachments to the selection.
+     *
+     * If the state only supports one attachment to be selected and multiple
+     * attachments are uploaded, the last attachment in the upload queue will
+     * be selected.
+     *
+     * @since 3.5.0
+     *
+     * @param {wp.media.model.Attachment} attachment
+     */
+    uploading: function( attachment ) {
+        var content = this.frame.content;
+
+        if ( 'upload' === content.mode() ) {
+            this.frame.content.mode('browse');
+        }
+
+        if ( this.get( 'autoSelect' ) ) {
+            this.get('selection').add( attachment );
+            this.frame.trigger( 'library:selection:add' );
+        }
+    },
+
+    /**
+     * Persist the mode of the content region as a user setting.
+     *
+     * @since 3.5.0
+     */
+    saveContentMode: function() {
+        if ( 'browse' !== this.get('router') ) {
+            return;
+        }
+
+        var mode = this.frame.content.mode(),
+            view = this.frame.router.get();
+
+        if ( view && view.get( mode ) ) {
+            setUserSetting( 'libraryContent', mode );
+        }
+    }
+});
+
+// Make selectionSync available on any Media Library state.
+_.extend( Library.prototype, wp.media.selectionSync );
+
+module.exports = Library;
+
+
+/***/ }),
+/* 32 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.controller.ImageDetails
+ *
+ * A state for editing the attachment display settings of an image that's been
+ * inserted into the editor.
+ *
+ * @class
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ *
+ * @param {object}                    [attributes]                       The attributes hash passed to the state.
+ * @param {string}                    [attributes.id=image-details]      Unique identifier.
+ * @param {string}                    [attributes.title=Image Details]   Title for the state. Displays in the frame's title region.
+ * @param {wp.media.model.Attachment} attributes.image                   The image's model.
+ * @param {string|false}              [attributes.content=image-details] Initial mode for the content region.
+ * @param {string|false}              [attributes.menu=false]            Initial mode for the menu region.
+ * @param {string|false}              [attributes.router=false]          Initial mode for the router region.
+ * @param {string|false}              [attributes.toolbar=image-details] Initial mode for the toolbar region.
+ * @param {boolean}                   [attributes.editing=false]         Unused.
+ * @param {int}                       [attributes.priority=60]           Unused.
+ *
+ * @todo This state inherits some defaults from media.controller.Library.prototype.defaults,
+ *       however this may not do anything.
+ */
+var State = wp.media.controller.State,
+    Library = wp.media.controller.Library,
+    l10n = wp.media.view.l10n,
+    ImageDetails;
+
+ImageDetails = State.extend({
+    defaults: _.defaults({
+        id:       'image-details',
+        title:    l10n.imageDetailsTitle,
+        content:  'image-details',
+        menu:     false,
+        router:   false,
+        toolbar:  'image-details',
+        editing:  false,
+        priority: 60
+    }, Library.prototype.defaults ),
+
+    /**
+     * @since 3.9.0
+     *
+     * @param options Attributes
+     */
+    initialize: function( options ) {
+        this.image = options.image;
+        State.prototype.initialize.apply( this, arguments );
+    },
+
+    /**
+     * @since 3.9.0
+     */
+    activate: function() {
+        this.frame.modal.$el.addClass('image-details');
+    }
+});
+
+module.exports = ImageDetails;
+
+
+/***/ }),
+/* 33 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.controller.GalleryEdit
+ *
+ * A state for editing a gallery's images and settings.
  *
  * @class
@@ -10 +1201 @@
  * @augments Backbone.Model
  *
+ * @param {object}                     [attributes]                       The attributes hash passed to the state.
+ * @param {string}                     [attributes.id=gallery-edit]       Unique identifier.
+ * @param {string}                     [attributes.title=Edit Gallery]    Title for the state. Displays in the frame's title region.
+ * @param {wp.media.model.Attachments} [attributes.library]               The collection of attachments in the gallery.
+ *                                                                        If one is not supplied, an empty media.model.Selection collection is created.
+ * @param {boolean}                    [attributes.multiple=false]        Whether multi-select is enabled.
+ * @param {boolean}                    [attributes.searchable=false]      Whether the library is searchable.
+ * @param {boolean}                    [attributes.sortable=true]         Whether the Attachments should be sortable. Depends on the orderby property being set to menuOrder on the attachments collection.
+ * @param {boolean}                    [attributes.date=true]             Whether to show the date filter in the browser's toolbar.
+ * @param {string|false}               [attributes.content=browse]        Initial mode for the content region.
+ * @param {string|false}               [attributes.toolbar=image-details] Initial mode for the toolbar region.
+ * @param {boolean}                    [attributes.describe=true]         Whether to offer UI to describe attachments - e.g. captioning images in a gallery.
+ * @param {boolean}                    [attributes.displaySettings=true]  Whether to show the attachment display settings interface.
+ * @param {boolean}                    [attributes.dragInfo=true]         Whether to show instructional text about the attachments being sortable.
+ * @param {int}                        [attributes.idealColumnWidth=170]  The ideal column width in pixels for attachments.
+ * @param {boolean}                    [attributes.editing=false]         Whether the gallery is being created, or editing an existing instance.
+ * @param {int}                        [attributes.priority=60]           The priority for the state link in the media menu.
+ * @param {boolean}                    [attributes.syncSelection=false]   Whether the Attachments selection should be persisted from the last state.
+ *                                                                        Defaults to false for this state, because the library passed in  *is* the selection.
+ * @param {view}                       [attributes.AttachmentView]        The single `Attachment` view to be used in the `Attachments`.
+ *                                                                        If none supplied, defaults to wp.media.view.Attachment.EditLibrary.
+ */
+var Library = wp.media.controller.Library,
+    l10n = wp.media.view.l10n,
+    GalleryEdit;
+
+GalleryEdit = Library.extend({
+    defaults: {
+        id:               'gallery-edit',
+        title:            l10n.editGalleryTitle,
+        multiple:         false,
+        searchable:       false,
+        sortable:         true,
+        date:             false,
+        display:          false,
+        content:          'browse',
+        toolbar:          'gallery-edit',
+        describe:         true,
+        displaySettings:  true,
+        dragInfo:         true,
+        idealColumnWidth: 170,
+        editing:          false,
+        priority:         60,
+        syncSelection:    false
+    },
+
+    /**
+     * @since 3.5.0
+     */
+    initialize: function() {
+        // If we haven't been provided a `library`, create a `Selection`.
+        if ( ! this.get('library') ) {
+            this.set( 'library', new wp.media.model.Selection() );
+        }
+
+        // The single `Attachment` view to be used in the `Attachments` view.
+        if ( ! this.get('AttachmentView') ) {
+            this.set( 'AttachmentView', wp.media.view.Attachment.EditLibrary );
+        }
+
+        Library.prototype.initialize.apply( this, arguments );
+    },
+
+    /**
+     * @since 3.5.0
+     */
+    activate: function() {
+        var library = this.get('library');
+
+        // Limit the library to images only.
+        library.props.set( 'type', 'image' );
+
+        // Watch for uploaded attachments.
+        this.get('library').observe( wp.Uploader.queue );
+
+        this.frame.on( 'content:render:browse', this.gallerySettings, this );
+
+        Library.prototype.activate.apply( this, arguments );
+    },
+
+    /**
+     * @since 3.5.0
+     */
+    deactivate: function() {
+        // Stop watching for uploaded attachments.
+        this.get('library').unobserve( wp.Uploader.queue );
+
+        this.frame.off( 'content:render:browse', this.gallerySettings, this );
+
+        Library.prototype.deactivate.apply( this, arguments );
+    },
+
+    /**
+     * @since 3.5.0
+     *
+     * @param browser
+     */
+    gallerySettings: function( browser ) {
+        if ( ! this.get('displaySettings') ) {
+            return;
+        }
+
+        var library = this.get('library');
+
+        if ( ! library || ! browser ) {
+            return;
+        }
+
+        library.gallery = library.gallery || new Backbone.Model();
+
+        browser.sidebar.set({
+            gallery: new wp.media.view.Settings.Gallery({
+                controller: this,
+                model:      library.gallery,
+                priority:   40
+            })
+        });
+
+        browser.toolbar.set( 'reverse', {
+            text:     l10n.reverseOrder,
+            priority: 80,
+
+            click: function() {
+                library.reset( library.toArray().reverse() );
+            }
+        });
+    }
+});
+
+module.exports = GalleryEdit;
+
+
+/***/ }),
+/* 34 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.controller.GalleryAdd
+ *
+ * A state for selecting more images to add to a gallery.
+ *
+ * @class
+ * @augments wp.media.controller.Library
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ *
  * @param {object}                     [attributes]                         The attributes hash passed to the state.
- * @param {string}                     [attributes.id=library]      Unique identifier.
- * @param {string}                     attributes.title                    Title for the state. Displays in the frame's title region.
+ * @param {string}                     [attributes.id=gallery-library]      Unique identifier.
+ * @param {string}                     [attributes.title=Add to Gallery]    Title for the state. Displays in the frame's title region.
  * @param {boolean}                    [attributes.multiple=add]            Whether multi-select is enabled. @todo 'add' doesn't seem do anything special, and gets used as a boolean.
  * @param {wp.media.model.Attachments} [attributes.library]                 The attachments collection to browse.
- *                                                                          If one is not supplied, a collection of attachments of the specified type will be created.
+ *                                                                          If one is not supplied, a collection of all images will be created.
  * @param {boolean|string}             [attributes.filterable=uploaded]     Whether the library is filterable, and if so what filters should be shown.
  *                                                                          Accepts 'all', 'uploaded', or 'unattached'.
@@ -30 +1367 @@
  * @param {boolean}                    [attributes.syncSelection=false]     Whether the Attachments selection should be persisted from the last state.
  *                                                                          Defaults to false because for this state, because the library of the Edit Gallery state is the selection.
- * @param {string}                     attributes.type                   The collection's media type. (e.g. 'video').
- * @param {string}                     attributes.collectionType         The collection type. (e.g. 'playlist').
  */
 var Selection = wp.media.model.Selection,
     Library = wp.media.controller.Library,
-    CollectionAdd;
-
-CollectionAdd = Library.extend({
-    defaults: _.defaults( {
-        // Selection defaults. @see media.model.Selection
+    l10n = wp.media.view.l10n,
+    GalleryAdd;
+
+GalleryAdd = Library.extend({
+    defaults: _.defaults({
+        id:            'gallery-library',
+        title:         l10n.addToGalleryTitle,
         multiple:      'add',
-        // Attachments browser defaults. @see media.view.AttachmentsBrowser
         filterable:    'uploaded',
-
+        menu:          'gallery',
+        toolbar:       'gallery-add',
         priority:      100,
         syncSelection: false
@@ -49 +1386 @@
 
     /**
-     * @since 3.9.0
+     * @since 3.5.0
      */
     initialize: function() {
-        var collectionType = this.get('collectionType');
-
-        if ( 'video' === this.get( 'type' ) ) {
-            collectionType = 'video-' + collectionType;
-        }
-
-        this.set( 'id', collectionType + '-library' );
-        this.set( 'toolbar', collectionType + '-add' );
-        this.set( 'menu', collectionType );
-
-        // If we haven't been provided a `library`, create a `Selection`.
+        // If a library wasn't supplied, create a library of images.
         if ( ! this.get('library') ) {
-            this.set( 'library', wp.media.query({ type: this.get('type') }) );
-        }
+            this.set( 'library', wp.media.query({ type: 'image' }) );
+        }
+
         Library.prototype.initialize.apply( this, arguments );
     },
 
     /**
-     * @since 3.9.0
+     * @since 3.5.0
      */
     activate: function() {
         var library = this.get('library'),
-            editLibrary = this.get('editLibrary'),
-            edit = this.frame.state( this.get('collectionType') + '-edit' ).get('library');
-
-        if ( editLibrary && editLibrary !== edit ) {
-            library.unobserve( editLibrary );
+            edit    = this.frame.state('gallery-edit').get('library');
+
+        if ( this.editLibrary && this.editLibrary !== edit ) {
+            library.unobserve( this.editLibrary );
         }
 
@@ -92 +1419 @@
         library.reset( library.mirroring.models, { silent: true });
         library.observe( edit );
-        this.set('editLibrary', edit);
+        this.editLibrary = edit;
 
         Library.prototype.activate.apply( this, arguments );
@@ -98 +1425 @@
 });
 
-module.exports = CollectionAdd;
-
-},{}],2:[function(require,module,exports){
+module.exports = GalleryAdd;
+
+
+/***/ }),
+/* 35 */
+/***/ (function(module, exports) {
+
 /**
  * wp.media.controller.CollectionEdit
@@ -262 +1593 @@
 module.exports = CollectionEdit;
 
-},{}],3:[function(require,module,exports){
+
+/***/ }),
+/* 36 */
+/***/ (function(module, exports) {
+
 /**
- * wp.media.controller.Cropper
- *
- * A state for cropping an image.
+ * wp.media.controller.CollectionAdd
+ *
+ * A state for adding attachments to a collection (e.g. video playlist).
  *
  * @class
+ * @augments wp.media.controller.Library
  * @augments wp.media.controller.State
  * @augments Backbone.Model
+ *
+ * @param {object}                     [attributes]                         The attributes hash passed to the state.
+ * @param {string}                     [attributes.id=library]      Unique identifier.
+ * @param {string}                     attributes.title                    Title for the state. Displays in the frame's title region.
+ * @param {boolean}                    [attributes.multiple=add]            Whether multi-select is enabled. @todo 'add' doesn't seem do anything special, and gets used as a boolean.
+ * @param {wp.media.model.Attachments} [attributes.library]                 The attachments collection to browse.
+ *                                                                          If one is not supplied, a collection of attachments of the specified type will be created.
+ * @param {boolean|string}             [attributes.filterable=uploaded]     Whether the library is filterable, and if so what filters should be shown.
+ *                                                                          Accepts 'all', 'uploaded', or 'unattached'.
+ * @param {string}                     [attributes.menu=gallery]            Initial mode for the menu region.
+ * @param {string}                     [attributes.content=upload]          Initial mode for the content region.
+ *                                                                          Overridden by persistent user setting if 'contentUserSetting' is true.
+ * @param {string}                     [attributes.router=browse]           Initial mode for the router region.
+ * @param {string}                     [attributes.toolbar=gallery-add]     Initial mode for the toolbar region.
+ * @param {boolean}                    [attributes.searchable=true]         Whether the library is searchable.
+ * @param {boolean}                    [attributes.sortable=true]           Whether the Attachments should be sortable. Depends on the orderby property being set to menuOrder on the attachments collection.
+ * @param {boolean}                    [attributes.autoSelect=true]         Whether an uploaded attachment should be automatically added to the selection.
+ * @param {boolean}                    [attributes.contentUserSetting=true] Whether the content region's mode should be set and persisted per user.
+ * @param {int}                        [attributes.priority=100]            The priority for the state link in the media menu.
+ * @param {boolean}                    [attributes.syncSelection=false]     Whether the Attachments selection should be persisted from the last state.
+ *                                                                          Defaults to false because for this state, because the library of the Edit Gallery state is the selection.
+ * @param {string}                     attributes.type                   The collection's media type. (e.g. 'video').
+ * @param {string}                     attributes.collectionType         The collection type. (e.g. 'playlist').
  */
-var l10n = wp.media.view.l10n,
-    Cropper;
-
-Cropper = wp.media.controller.State.extend({
-    defaults: {
-        id:          'cropper',
-        title:       l10n.cropImage,
-        // Region mode defaults.
-        toolbar:     'crop',
-        content:     'crop',
-        router:      false,
-
-        canSkipCrop: false
-    },
-
+var Selection = wp.media.model.Selection,
+    Library = wp.media.controller.Library,
+    CollectionAdd;
+
+CollectionAdd = Library.extend({
+    defaults: _.defaults( {
+        // Selection defaults. @see media.model.Selection
+        multiple:      'add',
+        // Attachments browser defaults. @see media.view.AttachmentsBrowser
+        filterable:    'uploaded',
+
+        priority:      100,
+        syncSelection: false
+    }, Library.prototype.defaults ),
+
+    /**
+     * @since 3.9.0
+     */
+    initialize: function() {
+        var collectionType = this.get('collectionType');
+
+        if ( 'video' === this.get( 'type' ) ) {
+            collectionType = 'video-' + collectionType;
+        }
+
+        this.set( 'id', collectionType + '-library' );
+        this.set( 'toolbar', collectionType + '-add' );
+        this.set( 'menu', collectionType );
+
+        // If we haven't been provided a `library`, create a `Selection`.
+        if ( ! this.get('library') ) {
+            this.set( 'library', wp.media.query({ type: this.get('type') }) );
+        }
+        Library.prototype.initialize.apply( this, arguments );
+    },
+
+    /**
+     * @since 3.9.0
+     */
     activate: function() {
-        this.frame.on( 'content:create:crop', this.createCropContent, this );
-        this.frame.on( 'close', this.removeCropper, this );
-        this.set('selection', new Backbone.Collection(this.frame._selection.single));
-    },
-
-    deactivate: function() {
-        this.frame.toolbar.mode('browse');
-    },
-
-    createCropContent: function() {
-        this.cropperView = new wp.media.view.Cropper({
-            controller: this,
-            attachment: this.get('selection').first()
-        });
-        this.cropperView.on('image-loaded', this.createCropToolbar, this);
-        this.frame.content.set(this.cropperView);
-
-    },
-    removeCropper: function() {
-        this.imgSelect.cancelSelection();
-        this.imgSelect.setOptions({remove: true});
-        this.imgSelect.update();
-        this.cropperView.remove();
-    },
-    createCropToolbar: function() {
-        var canSkipCrop, toolbarOptions;
-
-        canSkipCrop = this.get('canSkipCrop') || false;
-
-        toolbarOptions = {
-            controller: this.frame,
-            items: {
-                insert: {
-                    style:    'primary',
-                    text:     l10n.cropImage,
-                    priority: 80,
-                    requires: { library: false, selection: false },
-
-                    click: function() {
-                        var controller = this.controller,
-                            selection;
-
-                        selection = controller.state().get('selection').first();
-                        selection.set({cropDetails: controller.state().imgSelect.getSelection()});
-
-                        this.$el.text(l10n.cropping);
-                        this.$el.attr('disabled', true);
-
-                        controller.state().doCrop( selection ).done( function( croppedImage ) {
-                            controller.trigger('cropped', croppedImage );
-                            controller.close();
-                        }).fail( function() {
-                            controller.trigger('content:error:crop');
-                        });
-                    }
-                }
-            }
+        var library = this.get('library'),
+            editLibrary = this.get('editLibrary'),
+            edit = this.frame.state( this.get('collectionType') + '-edit' ).get('library');
+
+        if ( editLibrary && editLibrary !== edit ) {
+            library.unobserve( editLibrary );
+        }
+
+        // Accepts attachments that exist in the original library and
+        // that do not exist in gallery's library.
+        library.validator = function( attachment ) {
+            return !! this.mirroring.get( attachment.cid ) && ! edit.get( attachment.cid ) && Selection.prototype.validator.apply( this, arguments );
         };
 
-        if ( canSkipCrop ) {
-            _.extend( toolbarOptions.items, {
-                skip: {
-                    style:      'secondary',
-                    text:       l10n.skipCropping,
-                    priority:   70,
-                    requires:   { library: false, selection: false },
-                    click:      function() {
-                        var selection = this.controller.state().get('selection').first();
-                        this.controller.state().cropperView.remove();
-                        this.controller.trigger('skippedcrop', selection);
-                        this.controller.close();
-                    }
-                }
-            });
-        }
-
-        this.frame.toolbar.set( new wp.media.view.Toolbar(toolbarOptions) );
-    },
-
-    doCrop: function( attachment ) {
-        return wp.ajax.post( 'custom-header-crop', {
-            nonce: attachment.get('nonces').edit,
-            id: attachment.get('id'),
-            cropDetails: attachment.get('cropDetails')
-        } );
+        // Reset the library to ensure that all attachments are re-added
+        // to the collection. Do so silently, as calling `observe` will
+        // trigger the `reset` event.
+        library.reset( library.mirroring.models, { silent: true });
+        library.observe( edit );
+        this.set('editLibrary', edit);
+
+        Library.prototype.activate.apply( this, arguments );
     }
 });
 
-module.exports = Cropper;
-
-},{}],4:[function(require,module,exports){
-/**
- * wp.media.controller.CustomizeImageCropper
- *
- * A state for cropping an image.
- *
- * @class
- * @augments wp.media.controller.Cropper
- * @augments wp.media.controller.State
- * @augments Backbone.Model
- */
-var Controller = wp.media.controller,
-    CustomizeImageCropper;
-
-CustomizeImageCropper = Controller.Cropper.extend({
-    doCrop: function( attachment ) {
-        var cropDetails = attachment.get( 'cropDetails' ),
-            control = this.get( 'control' );
-
-        cropDetails.dst_width  = control.params.width;
-        cropDetails.dst_height = control.params.height;
-
-        return wp.ajax.post( 'crop-image', {
-            wp_customize: 'on',
-            nonce: attachment.get( 'nonces' ).edit,
-            id: attachment.get( 'id' ),
-            context: control.id,
-            cropDetails: cropDetails
-        } );
-    }
-});
-
-module.exports = CustomizeImageCropper;
-
-},{}],5:[function(require,module,exports){
-/**
- * wp.media.controller.EditImage
- *
- * A state for editing (cropping, etc.) an image.
- *
- * @class
- * @augments wp.media.controller.State
- * @augments Backbone.Model
- *
- * @param {object}                    attributes                      The attributes hash passed to the state.
- * @param {wp.media.model.Attachment} attributes.model                The attachment.
- * @param {string}                    [attributes.id=edit-image]      Unique identifier.
- * @param {string}                    [attributes.title=Edit Image]   Title for the state. Displays in the media menu and the frame's title region.
- * @param {string}                    [attributes.content=edit-image] Initial mode for the content region.
- * @param {string}                    [attributes.toolbar=edit-image] Initial mode for the toolbar region.
- * @param {string}                    [attributes.menu=false]         Initial mode for the menu region.
- * @param {string}                    [attributes.url]                Unused. @todo Consider removal.
- */
-var l10n = wp.media.view.l10n,
-    EditImage;
-
-EditImage = wp.media.controller.State.extend({
-    defaults: {
-        id:      'edit-image',
-        title:   l10n.editImage,
-        menu:    false,
-        toolbar: 'edit-image',
-        content: 'edit-image',
-        url:     ''
-    },
-
-    /**
-     * @since 3.9.0
-     */
-    activate: function() {
-        this.listenTo( this.frame, 'toolbar:render:edit-image', this.toolbar );
-    },
-
-    /**
-     * @since 3.9.0
-     */
-    deactivate: function() {
-        this.stopListening( this.frame );
-    },
-
-    /**
-     * @since 3.9.0
-     */
-    toolbar: function() {
-        var frame = this.frame,
-            lastState = frame.lastState(),
-            previous = lastState && lastState.id;
-
-        frame.toolbar.set( new wp.media.view.Toolbar({
-            controller: frame,
-            items: {
-                back: {
-                    style: 'primary',
-                    text:     l10n.back,
-                    priority: 20,
-                    click:    function() {
-                        if ( previous ) {
-                            frame.setState( previous );
-                        } else {
-                            frame.close();
-                        }
-                    }
-                }
-            }
-        }) );
-    }
-});
-
-module.exports = EditImage;
-
-},{}],6:[function(require,module,exports){
-/**
- * wp.media.controller.Embed
- *
- * A state for embedding media from a URL.
- *
- * @class
- * @augments wp.media.controller.State
- * @augments Backbone.Model
- *
- * @param {object} attributes                         The attributes hash passed to the state.
- * @param {string} [attributes.id=embed]              Unique identifier.
- * @param {string} [attributes.title=Insert From URL] Title for the state. Displays in the media menu and the frame's title region.
- * @param {string} [attributes.content=embed]         Initial mode for the content region.
- * @param {string} [attributes.menu=default]          Initial mode for the menu region.
- * @param {string} [attributes.toolbar=main-embed]    Initial mode for the toolbar region.
- * @param {string} [attributes.menu=false]            Initial mode for the menu region.
- * @param {int}    [attributes.priority=120]          The priority for the state link in the media menu.
- * @param {string} [attributes.type=link]             The type of embed. Currently only link is supported.
- * @param {string} [attributes.url]                   The embed URL.
- * @param {object} [attributes.metadata={}]           Properties of the embed, which will override attributes.url if set.
- */
-var l10n = wp.media.view.l10n,
-    $ = Backbone.$,
-    Embed;
-
-Embed = wp.media.controller.State.extend({
-    defaults: {
-        id:       'embed',
-        title:    l10n.insertFromUrlTitle,
-        content:  'embed',
-        menu:     'default',
-        toolbar:  'main-embed',
-        priority: 120,
-        type:     'link',
-        url:      '',
-        metadata: {}
-    },
-
-    // The amount of time used when debouncing the scan.
-    sensitivity: 400,
-
-    initialize: function(options) {
-        this.metadata = options.metadata;
-        this.debouncedScan = _.debounce( _.bind( this.scan, this ), this.sensitivity );
-        this.props = new Backbone.Model( this.metadata || { url: '' });
-        this.props.on( 'change:url', this.debouncedScan, this );
-        this.props.on( 'change:url', this.refresh, this );
-        this.on( 'scan', this.scanImage, this );
-    },
-
-    /**
-     * Trigger a scan of the embedded URL's content for metadata required to embed.
-     *
-     * @fires wp.media.controller.Embed#scan
-     */
-    scan: function() {
-        var scanners,
-            embed = this,
-            attributes = {
-                type: 'link',
-                scanners: []
-            };
-
-        // Scan is triggered with the list of `attributes` to set on the
-        // state, useful for the 'type' attribute and 'scanners' attribute,
-        // an array of promise objects for asynchronous scan operations.
-        if ( this.props.get('url') ) {
-            this.trigger( 'scan', attributes );
-        }
-
-        if ( attributes.scanners.length ) {
-            scanners = attributes.scanners = $.when.apply( $, attributes.scanners );
-            scanners.always( function() {
-                if ( embed.get('scanners') === scanners ) {
-                    embed.set( 'loading', false );
-                }
-            });
-        } else {
-            attributes.scanners = null;
-        }
-
-        attributes.loading = !! attributes.scanners;
-        this.set( attributes );
-    },
-    /**
-     * Try scanning the embed as an image to discover its dimensions.
-     *
-     * @param {Object} attributes
-     */
-    scanImage: function( attributes ) {
-        var frame = this.frame,
-            state = this,
-            url = this.props.get('url'),
-            image = new Image(),
-            deferred = $.Deferred();
-
-        attributes.scanners.push( deferred.promise() );
-
-        // Try to load the image and find its width/height.
-        image.onload = function() {
-            deferred.resolve();
-
-            if ( state !== frame.state() || url !== state.props.get('url') ) {
-                return;
-            }
-
-            state.set({
-                type: 'image'
-            });
-
-            state.props.set({
-                width:  image.width,
-                height: image.height
-            });
-        };
-
-        image.onerror = deferred.reject;
-        image.src = url;
-    },
-
-    refresh: function() {
-        this.frame.toolbar.get().refresh();
-    },
-
-    reset: function() {
-        this.props.clear().set({ url: '' });
-
-        if ( this.active ) {
-            this.refresh();
-        }
-    }
-});
-
-module.exports = Embed;
-
-},{}],7:[function(require,module,exports){
+module.exports = CollectionAdd;
+
+
+/***/ }),
+/* 37 */
+/***/ (function(module, exports) {
+
 /**
  * wp.media.controller.FeaturedImage
@@ -746 +1824 @@
 module.exports = FeaturedImage;
 
-},{}],8:[function(require,module,exports){
-/**
- * wp.media.controller.GalleryAdd
- *
- * A state for selecting more images to add to a gallery.
- *
- * @class
- * @augments wp.media.controller.Library
- * @augments wp.media.controller.State
- * @augments Backbone.Model
- *
- * @param {object}                     [attributes]                         The attributes hash passed to the state.
- * @param {string}                     [attributes.id=gallery-library]      Unique identifier.
- * @param {string}                     [attributes.title=Add to Gallery]    Title for the state. Displays in the frame's title region.
- * @param {boolean}                    [attributes.multiple=add]            Whether multi-select is enabled. @todo 'add' doesn't seem do anything special, and gets used as a boolean.
- * @param {wp.media.model.Attachments} [attributes.library]                 The attachments collection to browse.
- *                                                                          If one is not supplied, a collection of all images will be created.
- * @param {boolean|string}             [attributes.filterable=uploaded]     Whether the library is filterable, and if so what filters should be shown.
- *                                                                          Accepts 'all', 'uploaded', or 'unattached'.
- * @param {string}                     [attributes.menu=gallery]            Initial mode for the menu region.
- * @param {string}                     [attributes.content=upload]          Initial mode for the content region.
- *                                                                          Overridden by persistent user setting if 'contentUserSetting' is true.
- * @param {string}                     [attributes.router=browse]           Initial mode for the router region.
- * @param {string}                     [attributes.toolbar=gallery-add]     Initial mode for the toolbar region.
- * @param {boolean}                    [attributes.searchable=true]         Whether the library is searchable.
- * @param {boolean}                    [attributes.sortable=true]           Whether the Attachments should be sortable. Depends on the orderby property being set to menuOrder on the attachments collection.
- * @param {boolean}                    [attributes.autoSelect=true]         Whether an uploaded attachment should be automatically added to the selection.
- * @param {boolean}                    [attributes.contentUserSetting=true] Whether the content region's mode should be set and persisted per user.
- * @param {int}                        [attributes.priority=100]            The priority for the state link in the media menu.
- * @param {boolean}                    [attributes.syncSelection=false]     Whether the Attachments selection should be persisted from the last state.
- *                                                                          Defaults to false because for this state, because the library of the Edit Gallery state is the selection.
- */
-var Selection = wp.media.model.Selection,
-    Library = wp.media.controller.Library,
-    l10n = wp.media.view.l10n,
-    GalleryAdd;
-
-GalleryAdd = Library.extend({
-    defaults: _.defaults({
-        id:            'gallery-library',
-        title:         l10n.addToGalleryTitle,
-        multiple:      'add',
-        filterable:    'uploaded',
-        menu:          'gallery',
-        toolbar:       'gallery-add',
-        priority:      100,
-        syncSelection: false
-    }, Library.prototype.defaults ),
-
-    /**
-     * @since 3.5.0
-     */
-    initialize: function() {
-        // If a library wasn't supplied, create a library of images.
-        if ( ! this.get('library') ) {
-            this.set( 'library', wp.media.query({ type: 'image' }) );
-        }
-
-        Library.prototype.initialize.apply( this, arguments );
-    },
-
-    /**
-     * @since 3.5.0
-     */
-    activate: function() {
-        var library = this.get('library'),
-            edit    = this.frame.state('gallery-edit').get('library');
-
-        if ( this.editLibrary && this.editLibrary !== edit ) {
-            library.unobserve( this.editLibrary );
-        }
-
-        // Accepts attachments that exist in the original library and
-        // that do not exist in gallery's library.
-        library.validator = function( attachment ) {
-            return !! this.mirroring.get( attachment.cid ) && ! edit.get( attachment.cid ) && Selection.prototype.validator.apply( this, arguments );
-        };
-
-        // Reset the library to ensure that all attachments are re-added
-        // to the collection. Do so silently, as calling `observe` will
-        // trigger the `reset` event.
-        library.reset( library.mirroring.models, { silent: true });
-        library.observe( edit );
-        this.editLibrary = edit;
-
-        Library.prototype.activate.apply( this, arguments );
-    }
-});
-
-module.exports = GalleryAdd;
-
-},{}],9:[function(require,module,exports){
-/**
- * wp.media.controller.GalleryEdit
- *
- * A state for editing a gallery's images and settings.
- *
- * @class
- * @augments wp.media.controller.Library
- * @augments wp.media.controller.State
- * @augments Backbone.Model
- *
- * @param {object}                     [attributes]                       The attributes hash passed to the state.
- * @param {string}                     [attributes.id=gallery-edit]       Unique identifier.
- * @param {string}                     [attributes.title=Edit Gallery]    Title for the state. Displays in the frame's title region.
- * @param {wp.media.model.Attachments} [attributes.library]               The collection of attachments in the gallery.
- *                                                                        If one is not supplied, an empty media.model.Selection collection is created.
- * @param {boolean}                    [attributes.multiple=false]        Whether multi-select is enabled.
- * @param {boolean}                    [attributes.searchable=false]      Whether the library is searchable.
- * @param {boolean}                    [attributes.sortable=true]         Whether the Attachments should be sortable. Depends on the orderby property being set to menuOrder on the attachments collection.
- * @param {boolean}                    [attributes.date=true]             Whether to show the date filter in the browser's toolbar.
- * @param {string|false}               [attributes.content=browse]        Initial mode for the content region.
- * @param {string|false}               [attributes.toolbar=image-details] Initial mode for the toolbar region.
- * @param {boolean}                    [attributes.describe=true]         Whether to offer UI to describe attachments - e.g. captioning images in a gallery.
- * @param {boolean}                    [attributes.displaySettings=true]  Whether to show the attachment display settings interface.
- * @param {boolean}                    [attributes.dragInfo=true]         Whether to show instructional text about the attachments being sortable.
- * @param {int}                        [attributes.idealColumnWidth=170]  The ideal column width in pixels for attachments.
- * @param {boolean}                    [attributes.editing=false]         Whether the gallery is being created, or editing an existing instance.
- * @param {int}                        [attributes.priority=60]           The priority for the state link in the media menu.
- * @param {boolean}                    [attributes.syncSelection=false]   Whether the Attachments selection should be persisted from the last state.
- *                                                                        Defaults to false for this state, because the library passed in  *is* the selection.
- * @param {view}                       [attributes.AttachmentView]        The single `Attachment` view to be used in the `Attachments`.
- *                                                                        If none supplied, defaults to wp.media.view.Attachment.EditLibrary.
- */
-var Library = wp.media.controller.Library,
-    l10n = wp.media.view.l10n,
-    GalleryEdit;
-
-GalleryEdit = Library.extend({
-    defaults: {
-        id:               'gallery-edit',
-        title:            l10n.editGalleryTitle,
-        multiple:         false,
-        searchable:       false,
-        sortable:         true,
-        date:             false,
-        display:          false,
-        content:          'browse',
-        toolbar:          'gallery-edit',
-        describe:         true,
-        displaySettings:  true,
-        dragInfo:         true,
-        idealColumnWidth: 170,
-        editing:          false,
-        priority:         60,
-        syncSelection:    false
-    },
-
-    /**
-     * @since 3.5.0
-     */
-    initialize: function() {
-        // If we haven't been provided a `library`, create a `Selection`.
-        if ( ! this.get('library') ) {
-            this.set( 'library', new wp.media.model.Selection() );
-        }
-
-        // The single `Attachment` view to be used in the `Attachments` view.
-        if ( ! this.get('AttachmentView') ) {
-            this.set( 'AttachmentView', wp.media.view.Attachment.EditLibrary );
-        }
-
-        Library.prototype.initialize.apply( this, arguments );
-    },
-
-    /**
-     * @since 3.5.0
-     */
-    activate: function() {
-        var library = this.get('library');
-
-        // Limit the library to images only.
-        library.props.set( 'type', 'image' );
-
-        // Watch for uploaded attachments.
-        this.get('library').observe( wp.Uploader.queue );
-
-        this.frame.on( 'content:render:browse', this.gallerySettings, this );
-
-        Library.prototype.activate.apply( this, arguments );
-    },
-
-    /**
-     * @since 3.5.0
-     */
-    deactivate: function() {
-        // Stop watching for uploaded attachments.
-        this.get('library').unobserve( wp.Uploader.queue );
-
-        this.frame.off( 'content:render:browse', this.gallerySettings, this );
-
-        Library.prototype.deactivate.apply( this, arguments );
-    },
-
-    /**
-     * @since 3.5.0
-     *
-     * @param browser
-     */
-    gallerySettings: function( browser ) {
-        if ( ! this.get('displaySettings') ) {
-            return;
-        }
-
-        var library = this.get('library');
-
-        if ( ! library || ! browser ) {
-            return;
-        }
-
-        library.gallery = library.gallery || new Backbone.Model();
-
-        browser.sidebar.set({
-            gallery: new wp.media.view.Settings.Gallery({
-                controller: this,
-                model:      library.gallery,
-                priority:   40
-            })
-        });
-
-        browser.toolbar.set( 'reverse', {
-            text:     l10n.reverseOrder,
-            priority: 80,
-
-            click: function() {
-                library.reset( library.toArray().reverse() );
-            }
-        });
-    }
-});
-
-module.exports = GalleryEdit;
-
-},{}],10:[function(require,module,exports){
-/**
- * wp.media.controller.ImageDetails
- *
- * A state for editing the attachment display settings of an image that's been
- * inserted into the editor.
- *
- * @class
- * @augments wp.media.controller.State
- * @augments Backbone.Model
- *
- * @param {object}                    [attributes]                       The attributes hash passed to the state.
- * @param {string}                    [attributes.id=image-details]      Unique identifier.
- * @param {string}                    [attributes.title=Image Details]   Title for the state. Displays in the frame's title region.
- * @param {wp.media.model.Attachment} attributes.image                   The image's model.
- * @param {string|false}              [attributes.content=image-details] Initial mode for the content region.
- * @param {string|false}              [attributes.menu=false]            Initial mode for the menu region.
- * @param {string|false}              [attributes.router=false]          Initial mode for the router region.
- * @param {string|false}              [attributes.toolbar=image-details] Initial mode for the toolbar region.
- * @param {boolean}                   [attributes.editing=false]         Unused.
- * @param {int}                       [attributes.priority=60]           Unused.
- *
- * @todo This state inherits some defaults from media.controller.Library.prototype.defaults,
- *       however this may not do anything.
- */
-var State = wp.media.controller.State,
-    Library = wp.media.controller.Library,
-    l10n = wp.media.view.l10n,
-    ImageDetails;
-
-ImageDetails = State.extend({
-    defaults: _.defaults({
-        id:       'image-details',
-        title:    l10n.imageDetailsTitle,
-        content:  'image-details',
-        menu:     false,
-        router:   false,
-        toolbar:  'image-details',
-        editing:  false,
-        priority: 60
-    }, Library.prototype.defaults ),
-
-    /**
-     * @since 3.9.0
-     *
-     * @param options Attributes
-     */
-    initialize: function( options ) {
-        this.image = options.image;
-        State.prototype.initialize.apply( this, arguments );
-    },
-
-    /**
-     * @since 3.9.0
-     */
-    activate: function() {
-        this.frame.modal.$el.addClass('image-details');
-    }
-});
-
-module.exports = ImageDetails;
-
-},{}],11:[function(require,module,exports){
-/**
- * wp.media.controller.Library
- *
- * A state for choosing an attachment or group of attachments from the media library.
- *
- * @class
- * @augments wp.media.controller.State
- * @augments Backbone.Model
- * @mixes media.selectionSync
- *
- * @param {object}                          [attributes]                         The attributes hash passed to the state.
- * @param {string}                          [attributes.id=library]              Unique identifier.
- * @param {string}                          [attributes.title=Media library]     Title for the state. Displays in the media menu and the frame's title region.
- * @param {wp.media.model.Attachments}      [attributes.library]                 The attachments collection to browse.
- *                                                                               If one is not supplied, a collection of all attachments will be created.
- * @param {wp.media.model.Selection|object} [attributes.selection]               A collection to contain attachment selections within the state.
- *                                                                               If the 'selection' attribute is a plain JS object,
- *                                                                               a Selection will be created using its values as the selection instance's `props` model.
- *                                                                               Otherwise, it will copy the library's `props` model.
- * @param {boolean}                         [attributes.multiple=false]          Whether multi-select is enabled.
- * @param {string}                          [attributes.content=upload]          Initial mode for the content region.
- *                                                                               Overridden by persistent user setting if 'contentUserSetting' is true.
- * @param {string}                          [attributes.menu=default]            Initial mode for the menu region.
- * @param {string}                          [attributes.router=browse]           Initial mode for the router region.
- * @param {string}                          [attributes.toolbar=select]          Initial mode for the toolbar region.
- * @param {boolean}                         [attributes.searchable=true]         Whether the library is searchable.
- * @param {boolean|string}                  [attributes.filterable=false]        Whether the library is filterable, and if so what filters should be shown.
- *                                                                               Accepts 'all', 'uploaded', or 'unattached'.
- * @param {boolean}                         [attributes.sortable=true]           Whether the Attachments should be sortable. Depends on the orderby property being set to menuOrder on the attachments collection.
- * @param {boolean}                         [attributes.autoSelect=true]         Whether an uploaded attachment should be automatically added to the selection.
- * @param {boolean}                         [attributes.describe=false]          Whether to offer UI to describe attachments - e.g. captioning images in a gallery.
- * @param {boolean}                         [attributes.contentUserSetting=true] Whether the content region's mode should be set and persisted per user.
- * @param {boolean}                         [attributes.syncSelection=true]      Whether the Attachments selection should be persisted from the last state.
- */
-var l10n = wp.media.view.l10n,
-    getUserSetting = window.getUserSetting,
-    setUserSetting = window.setUserSetting,
-    Library;
-
-Library = wp.media.controller.State.extend({
-    defaults: {
-        id:                 'library',
-        title:              l10n.mediaLibraryTitle,
-        multiple:           false,
-        content:            'upload',
-        menu:               'default',
-        router:             'browse',
-        toolbar:            'select',
-        searchable:         true,
-        filterable:         false,
-        sortable:           true,
-        autoSelect:         true,
-        describe:           false,
-        contentUserSetting: true,
-        syncSelection:      true
-    },
-
-    /**
-     * If a library isn't provided, query all media items.
-     * If a selection instance isn't provided, create one.
-     *
-     * @since 3.5.0
-     */
-    initialize: function() {
-        var selection = this.get('selection'),
-            props;
-
-        if ( ! this.get('library') ) {
-            this.set( 'library', wp.media.query() );
-        }
-
-        if ( ! ( selection instanceof wp.media.model.Selection ) ) {
-            props = selection;
-
-            if ( ! props ) {
-                props = this.get('library').props.toJSON();
-                props = _.omit( props, 'orderby', 'query' );
-            }
-
-            this.set( 'selection', new wp.media.model.Selection( null, {
-                multiple: this.get('multiple'),
-                props: props
-            }) );
-        }
-
-        this.resetDisplays();
-    },
-
-    /**
-     * @since 3.5.0
-     */
-    activate: function() {
-        this.syncSelection();
-
-        wp.Uploader.queue.on( 'add', this.uploading, this );
-
-        this.get('selection').on( 'add remove reset', this.refreshContent, this );
-
-        if ( this.get( 'router' ) && this.get('contentUserSetting') ) {
-            this.frame.on( 'content:activate', this.saveContentMode, this );
-            this.set( 'content', getUserSetting( 'libraryContent', this.get('content') ) );
-        }
-    },
-
-    /**
-     * @since 3.5.0
-     */
-    deactivate: function() {
-        this.recordSelection();
-
-        this.frame.off( 'content:activate', this.saveContentMode, this );
-
-        // Unbind all event handlers that use this state as the context
-        // from the selection.
-        this.get('selection').off( null, null, this );
-
-        wp.Uploader.queue.off( null, null, this );
-    },
-
-    /**
-     * Reset the library to its initial state.
-     *
-     * @since 3.5.0
-     */
-    reset: function() {
-        this.get('selection').reset();
-        this.resetDisplays();
-        this.refreshContent();
-    },
-
-    /**
-     * Reset the attachment display settings defaults to the site options.
-     *
-     * If site options don't define them, fall back to a persistent user setting.
-     *
-     * @since 3.5.0
-     */
-    resetDisplays: function() {
-        var defaultProps = wp.media.view.settings.defaultProps;
-        this._displays = [];
-        this._defaultDisplaySettings = {
-            align: defaultProps.align || getUserSetting( 'align', 'none' ),
-            size:  defaultProps.size  || getUserSetting( 'imgsize', 'medium' ),
-            link:  defaultProps.link  || getUserSetting( 'urlbutton', 'file' )
-        };
-    },
-
-    /**
-     * Create a model to represent display settings (alignment, etc.) for an attachment.
-     *
-     * @since 3.5.0
-     *
-     * @param {wp.media.model.Attachment} attachment
-     * @returns {Backbone.Model}
-     */
-    display: function( attachment ) {
-        var displays = this._displays;
-
-        if ( ! displays[ attachment.cid ] ) {
-            displays[ attachment.cid ] = new Backbone.Model( this.defaultDisplaySettings( attachment ) );
-        }
-        return displays[ attachment.cid ];
-    },
-
-    /**
-     * Given an attachment, create attachment display settings properties.
-     *
-     * @since 3.6.0
-     *
-     * @param {wp.media.model.Attachment} attachment
-     * @returns {Object}
-     */
-    defaultDisplaySettings: function( attachment ) {
-        var settings = this._defaultDisplaySettings;
-        if ( settings.canEmbed = this.canEmbed( attachment ) ) {
-            settings.link = 'embed';
-        }
-        return settings;
-    },
-
-    /**
-     * Whether an attachment can be embedded (audio or video).
-     *
-     * @since 3.6.0
-     *
-     * @param {wp.media.model.Attachment} attachment
-     * @returns {Boolean}
-     */
-    canEmbed: function( attachment ) {
-        // If uploading, we know the filename but not the mime type.
-        if ( ! attachment.get('uploading') ) {
-            var type = attachment.get('type');
-            if ( type !== 'audio' && type !== 'video' ) {
-                return false;
-            }
-        }
-
-        return _.contains( wp.media.view.settings.embedExts, attachment.get('filename').split('.').pop() );
-    },
-
-
-    /**
-     * If the state is active, no items are selected, and the current
-     * content mode is not an option in the state's router (provided
-     * the state has a router), reset the content mode to the default.
-     *
-     * @since 3.5.0
-     */
-    refreshContent: function() {
-        var selection = this.get('selection'),
-            frame = this.frame,
-            router = frame.router.get(),
-            mode = frame.content.mode();
-
-        if ( this.active && ! selection.length && router && ! router.get( mode ) ) {
-            this.frame.content.render( this.get('content') );
-        }
-    },
-
-    /**
-     * Callback handler when an attachment is uploaded.
-     *
-     * Switch to the Media Library if uploaded from the 'Upload Files' tab.
-     *
-     * Adds any uploading attachments to the selection.
-     *
-     * If the state only supports one attachment to be selected and multiple
-     * attachments are uploaded, the last attachment in the upload queue will
-     * be selected.
-     *
-     * @since 3.5.0
-     *
-     * @param {wp.media.model.Attachment} attachment
-     */
-    uploading: function( attachment ) {
-        var content = this.frame.content;
-
-        if ( 'upload' === content.mode() ) {
-            this.frame.content.mode('browse');
-        }
-
-        if ( this.get( 'autoSelect' ) ) {
-            this.get('selection').add( attachment );
-            this.frame.trigger( 'library:selection:add' );
-        }
-    },
-
-    /**
-     * Persist the mode of the content region as a user setting.
-     *
-     * @since 3.5.0
-     */
-    saveContentMode: function() {
-        if ( 'browse' !== this.get('router') ) {
-            return;
-        }
-
-        var mode = this.frame.content.mode(),
-            view = this.frame.router.get();
-
-        if ( view && view.get( mode ) ) {
-            setUserSetting( 'libraryContent', mode );
-        }
-    }
-});
-
-// Make selectionSync available on any Media Library state.
-_.extend( Library.prototype, wp.media.selectionSync );
-
-module.exports = Library;
-
-},{}],12:[function(require,module,exports){
-/**
- * wp.media.controller.MediaLibrary
- *
- * @class
- * @augments wp.media.controller.Library
- * @augments wp.media.controller.State
- * @augments Backbone.Model
- */
-var Library = wp.media.controller.Library,
-    MediaLibrary;
-
-MediaLibrary = Library.extend({
-    defaults: _.defaults({
-        // Attachments browser defaults. @see media.view.AttachmentsBrowser
-        filterable:      'uploaded',
-
-        displaySettings: false,
-        priority:        80,
-        syncSelection:   false
-    }, Library.prototype.defaults ),
-
-    /**
-     * @since 3.9.0
-     *
-     * @param options
-     */
-    initialize: function( options ) {
-        this.media = options.media;
-        this.type = options.type;
-        this.set( 'library', wp.media.query({ type: this.type }) );
-
-        Library.prototype.initialize.apply( this, arguments );
-    },
-
-    /**
-     * @since 3.9.0
-     */
-    activate: function() {
-        // @todo this should use this.frame.
-        if ( wp.media.frame.lastMime ) {
-            this.set( 'library', wp.media.query({ type: wp.media.frame.lastMime }) );
-            delete wp.media.frame.lastMime;
-        }
-        Library.prototype.activate.apply( this, arguments );
-    }
-});
-
-module.exports = MediaLibrary;
-
-},{}],13:[function(require,module,exports){
-/**
- * wp.media.controller.Region
- *
- * A region is a persistent application layout area.
- *
- * A region assumes one mode at any time, and can be switched to another.
- *
- * When mode changes, events are triggered on the region's parent view.
- * The parent view will listen to specific events and fill the region with an
- * appropriate view depending on mode. For example, a frame listens for the
- * 'browse' mode t be activated on the 'content' view and then fills the region
- * with an AttachmentsBrowser view.
- *
- * @class
- *
- * @param {object}        options          Options hash for the region.
- * @param {string}        options.id       Unique identifier for the region.
- * @param {Backbone.View} options.view     A parent view the region exists within.
- * @param {string}        options.selector jQuery selector for the region within the parent view.
- */
-var Region = function( options ) {
-    _.extend( this, _.pick( options || {}, 'id', 'view', 'selector' ) );
-};
-
-// Use Backbone's self-propagating `extend` inheritance method.
-Region.extend = Backbone.Model.extend;
-
-_.extend( Region.prototype, {
-    /**
-     * Activate a mode.
-     *
-     * @since 3.5.0
-     *
-     * @param {string} mode
-     *
-     * @fires this.view#{this.id}:activate:{this._mode}
-     * @fires this.view#{this.id}:activate
-     * @fires this.view#{this.id}:deactivate:{this._mode}
-     * @fires this.view#{this.id}:deactivate
-     *
-     * @returns {wp.media.controller.Region} Returns itself to allow chaining.
-     */
-    mode: function( mode ) {
-        if ( ! mode ) {
-            return this._mode;
-        }
-        // Bail if we're trying to change to the current mode.
-        if ( mode === this._mode ) {
-            return this;
-        }
-
-        /**
-         * Region mode deactivation event.
-         *
-         * @event this.view#{this.id}:deactivate:{this._mode}
-         * @event this.view#{this.id}:deactivate
-         */
-        this.trigger('deactivate');
-
-        this._mode = mode;
-        this.render( mode );
-
-        /**
-         * Region mode activation event.
-         *
-         * @event this.view#{this.id}:activate:{this._mode}
-         * @event this.view#{this.id}:activate
-         */
-        this.trigger('activate');
-        return this;
-    },
-    /**
-     * Render a mode.
-     *
-     * @since 3.5.0
-     *
-     * @param {string} mode
-     *
-     * @fires this.view#{this.id}:create:{this._mode}
-     * @fires this.view#{this.id}:create
-     * @fires this.view#{this.id}:render:{this._mode}
-     * @fires this.view#{this.id}:render
-     *
-     * @returns {wp.media.controller.Region} Returns itself to allow chaining
-     */
-    render: function( mode ) {
-        // If the mode isn't active, activate it.
-        if ( mode && mode !== this._mode ) {
-            return this.mode( mode );
-        }
-
-        var set = { view: null },
-            view;
-
-        /**
-         * Create region view event.
-         *
-         * Region view creation takes place in an event callback on the frame.
-         *
-         * @event this.view#{this.id}:create:{this._mode}
-         * @event this.view#{this.id}:create
-         */
-        this.trigger( 'create', set );
-        view = set.view;
-
-        /**
-         * Render region view event.
-         *
-         * Region view creation takes place in an event callback on the frame.
-         *
-         * @event this.view#{this.id}:create:{this._mode}
-         * @event this.view#{this.id}:create
-         */
-        this.trigger( 'render', view );
-        if ( view ) {
-            this.set( view );
-        }
-        return this;
-    },
-
-    /**
-     * Get the region's view.
-     *
-     * @since 3.5.0
-     *
-     * @returns {wp.media.View}
-     */
-    get: function() {
-        return this.view.views.first( this.selector );
-    },
-
-    /**
-     * Set the region's view as a subview of the frame.
-     *
-     * @since 3.5.0
-     *
-     * @param {Array|Object} views
-     * @param {Object} [options={}]
-     * @returns {wp.Backbone.Subviews} Subviews is returned to allow chaining
-     */
-    set: function( views, options ) {
-        if ( options ) {
-            options.add = false;
-        }
-        return this.view.views.set( this.selector, views, options );
-    },
-
-    /**
-     * Trigger regional view events on the frame.
-     *
-     * @since 3.5.0
-     *
-     * @param {string} event
-     * @returns {undefined|wp.media.controller.Region} Returns itself to allow chaining.
-     */
-    trigger: function( event ) {
-        var base, args;
-
-        if ( ! this._mode ) {
-            return;
-        }
-
-        args = _.toArray( arguments );
-        base = this.id + ':' + event;
-
-        // Trigger `{this.id}:{event}:{this._mode}` event on the frame.
-        args[0] = base + ':' + this._mode;
-        this.view.trigger.apply( this.view, args );
-
-        // Trigger `{this.id}:{event}` event on the frame.
-        args[0] = base;
-        this.view.trigger.apply( this.view, args );
-        return this;
-    }
-});
-
-module.exports = Region;
-
-},{}],14:[function(require,module,exports){
+
+/***/ }),
+/* 38 */
+/***/ (function(module, exports) {
+
 /**
  * wp.media.controller.ReplaceImage
@@ -1650 +1936 @@
 module.exports = ReplaceImage;
 
-},{}],15:[function(require,module,exports){
+
+/***/ }),
+/* 39 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.controller.EditImage
+ *
+ * A state for editing (cropping, etc.) an image.
+ *
+ * @class
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ *
+ * @param {object}                    attributes                      The attributes hash passed to the state.
+ * @param {wp.media.model.Attachment} attributes.model                The attachment.
+ * @param {string}                    [attributes.id=edit-image]      Unique identifier.
+ * @param {string}                    [attributes.title=Edit Image]   Title for the state. Displays in the media menu and the frame's title region.
+ * @param {string}                    [attributes.content=edit-image] Initial mode for the content region.
+ * @param {string}                    [attributes.toolbar=edit-image] Initial mode for the toolbar region.
+ * @param {string}                    [attributes.menu=false]         Initial mode for the menu region.
+ * @param {string}                    [attributes.url]                Unused. @todo Consider removal.
+ */
+var l10n = wp.media.view.l10n,
+    EditImage;
+
+EditImage = wp.media.controller.State.extend({
+    defaults: {
+        id:      'edit-image',
+        title:   l10n.editImage,
+        menu:    false,
+        toolbar: 'edit-image',
+        content: 'edit-image',
+        url:     ''
+    },
+
+    /**
+     * @since 3.9.0
+     */
+    activate: function() {
+        this.listenTo( this.frame, 'toolbar:render:edit-image', this.toolbar );
+    },
+
+    /**
+     * @since 3.9.0
+     */
+    deactivate: function() {
+        this.stopListening( this.frame );
+    },
+
+    /**
+     * @since 3.9.0
+     */
+    toolbar: function() {
+        var frame = this.frame,
+            lastState = frame.lastState(),
+            previous = lastState && lastState.id;
+
+        frame.toolbar.set( new wp.media.view.Toolbar({
+            controller: frame,
+            items: {
+                back: {
+                    style: 'primary',
+                    text:     l10n.back,
+                    priority: 20,
+                    click:    function() {
+                        if ( previous ) {
+                            frame.setState( previous );
+                        } else {
+                            frame.close();
+                        }
+                    }
+                }
+            }
+        }) );
+    }
+});
+
+module.exports = EditImage;
+
+
+/***/ }),
+/* 40 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.controller.MediaLibrary
+ *
+ * @class
+ * @augments wp.media.controller.Library
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ */
+var Library = wp.media.controller.Library,
+    MediaLibrary;
+
+MediaLibrary = Library.extend({
+    defaults: _.defaults({
+        // Attachments browser defaults. @see media.view.AttachmentsBrowser
+        filterable:      'uploaded',
+
+        displaySettings: false,
+        priority:        80,
+        syncSelection:   false
+    }, Library.prototype.defaults ),
+
+    /**
+     * @since 3.9.0
+     *
+     * @param options
+     */
+    initialize: function( options ) {
+        this.media = options.media;
+        this.type = options.type;
+        this.set( 'library', wp.media.query({ type: this.type }) );
+
+        Library.prototype.initialize.apply( this, arguments );
+    },
+
+    /**
+     * @since 3.9.0
+     */
+    activate: function() {
+        // @todo this should use this.frame.
+        if ( wp.media.frame.lastMime ) {
+            this.set( 'library', wp.media.query({ type: wp.media.frame.lastMime }) );
+            delete wp.media.frame.lastMime;
+        }
+        Library.prototype.activate.apply( this, arguments );
+    }
+});
+
+module.exports = MediaLibrary;
+
+
+/***/ }),
+/* 41 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.controller.Embed
+ *
+ * A state for embedding media from a URL.
+ *
+ * @class
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ *
+ * @param {object} attributes                         The attributes hash passed to the state.
+ * @param {string} [attributes.id=embed]              Unique identifier.
+ * @param {string} [attributes.title=Insert From URL] Title for the state. Displays in the media menu and the frame's title region.
+ * @param {string} [attributes.content=embed]         Initial mode for the content region.
+ * @param {string} [attributes.menu=default]          Initial mode for the menu region.
+ * @param {string} [attributes.toolbar=main-embed]    Initial mode for the toolbar region.
+ * @param {string} [attributes.menu=false]            Initial mode for the menu region.
+ * @param {int}    [attributes.priority=120]          The priority for the state link in the media menu.
+ * @param {string} [attributes.type=link]             The type of embed. Currently only link is supported.
+ * @param {string} [attributes.url]                   The embed URL.
+ * @param {object} [attributes.metadata={}]           Properties of the embed, which will override attributes.url if set.
+ */
+var l10n = wp.media.view.l10n,
+    $ = Backbone.$,
+    Embed;
+
+Embed = wp.media.controller.State.extend({
+    defaults: {
+        id:       'embed',
+        title:    l10n.insertFromUrlTitle,
+        content:  'embed',
+        menu:     'default',
+        toolbar:  'main-embed',
+        priority: 120,
+        type:     'link',
+        url:      '',
+        metadata: {}
+    },
+
+    // The amount of time used when debouncing the scan.
+    sensitivity: 400,
+
+    initialize: function(options) {
+        this.metadata = options.metadata;
+        this.debouncedScan = _.debounce( _.bind( this.scan, this ), this.sensitivity );
+        this.props = new Backbone.Model( this.metadata || { url: '' });
+        this.props.on( 'change:url', this.debouncedScan, this );
+        this.props.on( 'change:url', this.refresh, this );
+        this.on( 'scan', this.scanImage, this );
+    },
+
+    /**
+     * Trigger a scan of the embedded URL's content for metadata required to embed.
+     *
+     * @fires wp.media.controller.Embed#scan
+     */
+    scan: function() {
+        var scanners,
+            embed = this,
+            attributes = {
+                type: 'link',
+                scanners: []
+            };
+
+        // Scan is triggered with the list of `attributes` to set on the
+        // state, useful for the 'type' attribute and 'scanners' attribute,
+        // an array of promise objects for asynchronous scan operations.
+        if ( this.props.get('url') ) {
+            this.trigger( 'scan', attributes );
+        }
+
+        if ( attributes.scanners.length ) {
+            scanners = attributes.scanners = $.when.apply( $, attributes.scanners );
+            scanners.always( function() {
+                if ( embed.get('scanners') === scanners ) {
+                    embed.set( 'loading', false );
+                }
+            });
+        } else {
+            attributes.scanners = null;
+        }
+
+        attributes.loading = !! attributes.scanners;
+        this.set( attributes );
+    },
+    /**
+     * Try scanning the embed as an image to discover its dimensions.
+     *
+     * @param {Object} attributes
+     */
+    scanImage: function( attributes ) {
+        var frame = this.frame,
+            state = this,
+            url = this.props.get('url'),
+            image = new Image(),
+            deferred = $.Deferred();
+
+        attributes.scanners.push( deferred.promise() );
+
+        // Try to load the image and find its width/height.
+        image.onload = function() {
+            deferred.resolve();
+
+            if ( state !== frame.state() || url !== state.props.get('url') ) {
+                return;
+            }
+
+            state.set({
+                type: 'image'
+            });
+
+            state.props.set({
+                width:  image.width,
+                height: image.height
+            });
+        };
+
+        image.onerror = deferred.reject;
+        image.src = url;
+    },
+
+    refresh: function() {
+        this.frame.toolbar.get().refresh();
+    },
+
+    reset: function() {
+        this.props.clear().set({ url: '' });
+
+        if ( this.active ) {
+            this.refresh();
+        }
+    }
+});
+
+module.exports = Embed;
+
+
+/***/ }),
+/* 42 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.controller.Cropper
+ *
+ * A state for cropping an image.
+ *
+ * @class
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ */
+var l10n = wp.media.view.l10n,
+    Cropper;
+
+Cropper = wp.media.controller.State.extend({
+    defaults: {
+        id:          'cropper',
+        title:       l10n.cropImage,
+        // Region mode defaults.
+        toolbar:     'crop',
+        content:     'crop',
+        router:      false,
+
+        canSkipCrop: false
+    },
+
+    activate: function() {
+        this.frame.on( 'content:create:crop', this.createCropContent, this );
+        this.frame.on( 'close', this.removeCropper, this );
+        this.set('selection', new Backbone.Collection(this.frame._selection.single));
+    },
+
+    deactivate: function() {
+        this.frame.toolbar.mode('browse');
+    },
+
+    createCropContent: function() {
+        this.cropperView = new wp.media.view.Cropper({
+            controller: this,
+            attachment: this.get('selection').first()
+        });
+        this.cropperView.on('image-loaded', this.createCropToolbar, this);
+        this.frame.content.set(this.cropperView);
+
+    },
+    removeCropper: function() {
+        this.imgSelect.cancelSelection();
+        this.imgSelect.setOptions({remove: true});
+        this.imgSelect.update();
+        this.cropperView.remove();
+    },
+    createCropToolbar: function() {
+        var canSkipCrop, toolbarOptions;
+
+        canSkipCrop = this.get('canSkipCrop') || false;
+
+        toolbarOptions = {
+            controller: this.frame,
+            items: {
+                insert: {
+                    style:    'primary',
+                    text:     l10n.cropImage,
+                    priority: 80,
+                    requires: { library: false, selection: false },
+
+                    click: function() {
+                        var controller = this.controller,
+                            selection;
+
+                        selection = controller.state().get('selection').first();
+                        selection.set({cropDetails: controller.state().imgSelect.getSelection()});
+
+                        this.$el.text(l10n.cropping);
+                        this.$el.attr('disabled', true);
+
+                        controller.state().doCrop( selection ).done( function( croppedImage ) {
+                            controller.trigger('cropped', croppedImage );
+                            controller.close();
+                        }).fail( function() {
+                            controller.trigger('content:error:crop');
+                        });
+                    }
+                }
+            }
+        };
+
+        if ( canSkipCrop ) {
+            _.extend( toolbarOptions.items, {
+                skip: {
+                    style:      'secondary',
+                    text:       l10n.skipCropping,
+                    priority:   70,
+                    requires:   { library: false, selection: false },
+                    click:      function() {
+                        var selection = this.controller.state().get('selection').first();
+                        this.controller.state().cropperView.remove();
+                        this.controller.trigger('skippedcrop', selection);
+                        this.controller.close();
+                    }
+                }
+            });
+        }
+
+        this.frame.toolbar.set( new wp.media.view.Toolbar(toolbarOptions) );
+    },
+
+    doCrop: function( attachment ) {
+        return wp.ajax.post( 'custom-header-crop', {
+            nonce: attachment.get('nonces').edit,
+            id: attachment.get('id'),
+            cropDetails: attachment.get('cropDetails')
+        } );
+    }
+});
+
+module.exports = Cropper;
+
+
+/***/ }),
+/* 43 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.controller.CustomizeImageCropper
+ *
+ * A state for cropping an image.
+ *
+ * @class
+ * @augments wp.media.controller.Cropper
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ */
+var Controller = wp.media.controller,
+    CustomizeImageCropper;
+
+CustomizeImageCropper = Controller.Cropper.extend({
+    doCrop: function( attachment ) {
+        var cropDetails = attachment.get( 'cropDetails' ),
+            control = this.get( 'control' );
+
+        cropDetails.dst_width  = control.params.width;
+        cropDetails.dst_height = control.params.height;
+
+        return wp.ajax.post( 'crop-image', {
+            wp_customize: 'on',
+            nonce: attachment.get( 'nonces' ).edit,
+            id: attachment.get( 'id' ),
+            context: control.id,
+            cropDetails: cropDetails
+        } );
+    }
+});
+
+module.exports = CustomizeImageCropper;
+
+
+/***/ }),
+/* 44 */
+/***/ (function(module, exports) {
+
 /**
  * wp.media.controller.SiteIconCropper
@@ -1699 +2421 @@
 module.exports = SiteIconCropper;
 
-},{}],16:[function(require,module,exports){
+
+/***/ }),
+/* 45 */
+/***/ (function(module, exports) {
+
 /**
- * wp.media.controller.StateMachine
- *
- * A state machine keeps track of state. It is in one state at a time,
- * and can change from one state to another.
- *
- * States are stored as models in a Backbone collection.
- *
- * @since 3.5.0
+ * wp.media.View
+ *
+ * The base view class for media.
+ *
+ * Undelegating events, removing events from the model, and
+ * removing events from the controller mirror the code for
+ * `Backbone.View.dispose` in Backbone 0.9.8 development.
+ *
+ * This behavior has since been removed, and should not be used
+ * outside of the media manager.
  *
  * @class
- * @augments Backbone.Model
- * @mixin
- * @mixes Backbone.Events
- *
- * @param {Array} states
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
  */
-var StateMachine = function( states ) {
-    // @todo This is dead code. The states collection gets created in media.view.Frame._createStates.
-    this.states = new Backbone.Collection( states );
-};
-
-// Use Backbone's self-propagating `extend` inheritance method.
-StateMachine.extend = Backbone.Model.extend;
-
-_.extend( StateMachine.prototype, Backbone.Events, {
-    /**
-     * Fetch a state.
+var View = wp.Backbone.View.extend({
+    constructor: function( options ) {
+        if ( options && options.controller ) {
+            this.controller = options.controller;
+        }
+        wp.Backbone.View.apply( this, arguments );
+    },
+    /**
+     * @todo The internal comment mentions this might have been a stop-gap
+     *       before Backbone 0.9.8 came out. Figure out if Backbone core takes
+     *       care of this in Backbone.View now.
      *
-     * If no `id` is provided, returns the active state.
-     *
-     * Implicitly creates states.
-     *
-     * Ensure that the `states` collection exists so the `StateMachine`
-     *   can be used as a mixin.
-     *
-     * @since 3.5.0
-     *
-     * @param {string} id
-     * @returns {wp.media.controller.State} Returns a State model
-     *   from the StateMachine collection
-     */
-    state: function( id ) {
-        this.states = this.states || new Backbone.Collection();
-
-        // Default to the active state.
-        id = id || this._state;
-
-        if ( id && ! this.states.get( id ) ) {
-            this.states.add({ id: id });
-        }
-        return this.states.get( id );
-    },
-
-    /**
-     * Sets the active state.
-     *
-     * Bail if we're trying to select the current state, if we haven't
-     * created the `states` collection, or are trying to select a state
-     * that does not exist.
-     *
-     * @since 3.5.0
-     *
-     * @param {string} id
-     *
-     * @fires wp.media.controller.State#deactivate
-     * @fires wp.media.controller.State#activate
-     *
-     * @returns {wp.media.controller.StateMachine} Returns itself to allow chaining
-     */
-    setState: function( id ) {
-        var previous = this.state();
-
-        if ( ( previous && id === previous.id ) || ! this.states || ! this.states.get( id ) ) {
-            return this;
-        }
-
-        if ( previous ) {
-            previous.trigger('deactivate');
-            this._lastState = previous.id;
-        }
-
-        this._state = id;
-        this.state().trigger('activate');
+     * @returns {wp.media.View} Returns itself to allow chaining
+     */
+    dispose: function() {
+        // Undelegating events, removing events from the model, and
+        // removing events from the controller mirror the code for
+        // `Backbone.View.dispose` in Backbone 0.9.8 development.
+        this.undelegateEvents();
+
+        if ( this.model && this.model.off ) {
+            this.model.off( null, null, this );
+        }
+
+        if ( this.collection && this.collection.off ) {
+            this.collection.off( null, null, this );
+        }
+
+        // Unbind controller events.
+        if ( this.controller && this.controller.off ) {
+            this.controller.off( null, null, this );
+        }
 
         return this;
     },
-
-    /**
-     * Returns the previous active state.
-     *
-     * Call the `state()` method with no parameters to retrieve the current
-     * active state.
-     *
-     * @since 3.5.0
-     *
-     * @returns {wp.media.controller.State} Returns a State model
-     *    from the StateMachine collection
-     */
-    lastState: function() {
-        if ( this._lastState ) {
-            return this.state( this._lastState );
-        }
+    /**
+     * @returns {wp.media.View} Returns itself to allow chaining
+     */
+    remove: function() {
+        this.dispose();
+        /**
+         * call 'remove' directly on the parent class
+         */
+        return wp.Backbone.View.prototype.remove.apply( this, arguments );
     }
 });
 
-// Map all event binding and triggering on a StateMachine to its `states` collection.
-_.each([ 'on', 'off', 'trigger' ], function( method ) {
-    /**
-     * @returns {wp.media.controller.StateMachine} Returns itself to allow chaining.
-     */
-    StateMachine.prototype[ method ] = function() {
-        // Ensure that the `states` collection exists so the `StateMachine`
-        // can be used as a mixin.
-        this.states = this.states || new Backbone.Collection();
-        // Forward the method to the `states` collection.
-        this.states[ method ].apply( this.states, arguments );
+module.exports = View;
+
+
+/***/ }),
+/* 46 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.Frame
+ *
+ * A frame is a composite view consisting of one or more regions and one or more
+ * states.
+ *
+ * @see wp.media.controller.State
+ * @see wp.media.controller.Region
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ * @mixes wp.media.controller.StateMachine
+ */
+var Frame = wp.media.View.extend({
+    initialize: function() {
+        _.defaults( this.options, {
+            mode: [ 'select' ]
+        });
+        this._createRegions();
+        this._createStates();
+        this._createModes();
+    },
+
+    _createRegions: function() {
+        // Clone the regions array.
+        this.regions = this.regions ? this.regions.slice() : [];
+
+        // Initialize regions.
+        _.each( this.regions, function( region ) {
+            this[ region ] = new wp.media.controller.Region({
+                view:     this,
+                id:       region,
+                selector: '.media-frame-' + region
+            });
+        }, this );
+    },
+    /**
+     * Create the frame's states.
+     *
+     * @see wp.media.controller.State
+     * @see wp.media.controller.StateMachine
+     *
+     * @fires wp.media.controller.State#ready
+     */
+    _createStates: function() {
+        // Create the default `states` collection.
+        this.states = new Backbone.Collection( null, {
+            model: wp.media.controller.State
+        });
+
+        // Ensure states have a reference to the frame.
+        this.states.on( 'add', function( model ) {
+            model.frame = this;
+            model.trigger('ready');
+        }, this );
+
+        if ( this.options.states ) {
+            this.states.add( this.options.states );
+        }
+    },
+
+    /**
+     * A frame can be in a mode or multiple modes at one time.
+     *
+     * For example, the manage media frame can be in the `Bulk Select` or `Edit` mode.
+     */
+    _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 );
+    },
+    /**
+     * Reset all states on the frame to their defaults.
+     *
+     * @returns {wp.media.view.Frame} Returns itself to allow chaining
+     */
+    reset: function() {
+        this.states.invoke( 'trigger', 'reset' );
+        return this;
+    },
+    /**
+     * Map activeMode collection events to the frame.
+     */
+    triggerModeEvents: function( model, collection, options ) {
+        var collectionEvent,
+            modeEventMap = {
+                add: 'activate',
+                remove: 'deactivate'
+            },
+            eventToTrigger;
+        // Probably a better way to do this.
+        _.each( options, function( value, key ) {
+            if ( value ) {
+                collectionEvent = key;
+            }
+        } );
+
+        if ( ! _.has( modeEventMap, collectionEvent ) ) {
+            return;
+        }
+
+        eventToTrigger = model.get('id') + ':' + modeEventMap[collectionEvent];
+        this.trigger( eventToTrigger );
+    },
+    /**
+     * Activate a mode on the frame.
+     *
+     * @param string mode Mode ID.
+     * @returns {this} Returns itself to allow chaining.
+     */
+    activateMode: function( mode ) {
+        // Bail if the mode is already active.
+        if ( this.isModeActive( mode ) ) {
+            return;
+        }
+        this.activeModes.add( [ { id: mode } ] );
+        // Add a CSS class to the frame so elements can be styled for the mode.
+        this.$el.addClass( 'mode-' + mode );
+
+        return this;
+    },
+    /**
+     * Deactivate a mode on the frame.
+     *
+     * @param string mode Mode ID.
+     * @returns {this} Returns itself to allow chaining.
+     */
+    deactivateMode: function( mode ) {
+        // Bail if the mode isn't active.
+        if ( ! this.isModeActive( mode ) ) {
+            return this;
+        }
+        this.activeModes.remove( this.activeModes.where( { id: mode } ) );
+        this.$el.removeClass( 'mode-' + mode );
+        /**
+         * Frame mode deactivation event.
+         *
+         * @event this#{mode}:deactivate
+         */
+        this.trigger( mode + ':deactivate' );
+
+        return this;
+    },
+    /**
+     * Check if a mode is enabled on the frame.
+     *
+     * @param  string mode Mode ID.
+     * @return bool
+     */
+    isModeActive: function( mode ) {
+        return Boolean( this.activeModes.where( { id: mode } ).length );
+    }
+});
+
+// Make the `Frame` a `StateMachine`.
+_.extend( Frame.prototype, wp.media.controller.StateMachine.prototype );
+
+module.exports = Frame;
+
+
+/***/ }),
+/* 47 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.MediaFrame
+ *
+ * The frame used to create the media modal.
+ *
+ * @class
+ * @augments wp.media.view.Frame
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ * @mixes wp.media.controller.StateMachine
+ */
+var Frame = wp.media.view.Frame,
+    $ = jQuery,
+    MediaFrame;
+
+MediaFrame = Frame.extend({
+    className: 'media-frame',
+    template:  wp.template('media-frame'),
+    regions:   ['menu','title','content','toolbar','router'],
+
+    events: {
+        'click div.media-frame-title h1': 'toggleMenu'
+    },
+
+    /**
+     * @global wp.Uploader
+     */
+    initialize: function() {
+        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 wp.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 wp.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');
+
+        this.on( 'title:render', function( view ) {
+            view.$el.append( '<span class="dashicons dashicons-arrow-down"></span>' );
+        });
+
+        // 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 Frame.prototype.render.apply( this, arguments );
+    },
+    /**
+     * @param {Object} title
+     * @this wp.media.controller.Region
+     */
+    createTitle: function( title ) {
+        title.view = new wp.media.View({
+            controller: this,
+            tagName: 'h1'
+        });
+    },
+    /**
+     * @param {Object} menu
+     * @this wp.media.controller.Region
+     */
+    createMenu: function( menu ) {
+        menu.view = new wp.media.view.Menu({
+            controller: this
+        });
+    },
+
+    toggleMenu: function() {
+        this.$el.find( '.media-menu' ).toggleClass( 'visible' );
+    },
+
+    /**
+     * @param {Object} toolbar
+     * @this wp.media.controller.Region
+     */
+    createToolbar: function( toolbar ) {
+        toolbar.view = new wp.media.view.Toolbar({
+            controller: this
+        });
+    },
+    /**
+     * @param {Object} router
+     * @this wp.media.controller.Region
+     */
+    createRouter: function( router ) {
+        router.view = new wp.media.view.Router({
+            controller: this
+        });
+    },
+    /**
+     * @param {Object} options
+     */
+    createIframeStates: function( options ) {
+        var settings = wp.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( 'content:deactivate:iframe', this.iframeContentCleanup, 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 wp.media.view.Iframe({
+            controller: this
+        });
+    },
+
+    iframeContentCleanup: function() {
+        this.$el.removeClass('hide-toolbar');
+    },
+
+    iframeMenu: function( view ) {
+        var views = {};
+
+        if ( ! view ) {
+            return;
+        }
+
+        _.each( wp.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 some of the modal's methods to the frame.
+_.each(['open','close','attach','detach','escape'], function( method ) {
+    /**
+     * @returns {wp.media.view.MediaFrame} Returns itself to allow chaining
+     */
+    MediaFrame.prototype[ method ] = function() {
+        if ( this.modal ) {
+            this.modal[ method ].apply( this.modal, arguments );
+        }
         return this;
     };
 });
 
-module.exports = StateMachine;
-
-},{}],17:[function(require,module,exports){
+module.exports = MediaFrame;
+
+
+/***/ }),
+/* 48 */
+/***/ (function(module, exports) {
+
 /**
- * wp.media.controller.State
- *
- * A state is a step in a workflow that when set will trigger the controllers
- * for the regions to be updated as specified in the frame.
- *
- * A state has an event-driven lifecycle:
- *
- *     'ready'      triggers when a state is added to a state machine's collection.
- *     'activate'   triggers when a state is activated by a state machine.
- *     'deactivate' triggers when a state is deactivated by a state machine.
- *     'reset'      is not triggered automatically. It should be invoked by the
- *                  proper controller to reset the state to its default.
+ * wp.media.view.MediaFrame.Select
+ *
+ * A frame for selecting an item or items from the media library.
  *
  * @class
- * @augments Backbone.Model
+ * @augments wp.media.view.MediaFrame
+ * @augments wp.media.view.Frame
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ * @mixes wp.media.controller.StateMachine
  */
-var State = Backbone.Model.extend({
-    /**
-     * Constructor.
+
+var MediaFrame = wp.media.view.MediaFrame,
+    l10n = wp.media.view.l10n,
+    Select;
+
+Select = MediaFrame.extend({
+    initialize: function() {
+        // Call 'initialize' directly on the parent class.
+        MediaFrame.prototype.initialize.apply( this, arguments );
+
+        _.defaults( this.options, {
+            selection: [],
+            library:   {},
+            multiple:  false,
+            state:    'library'
+        });
+
+        this.createSelection();
+        this.createStates();
+        this.bindHandlers();
+    },
+
+    /**
+     * Attach a selection collection to the frame.
      *
-     * @since 3.5.0
-     */
-    constructor: function() {
-        this.on( 'activate', this._preActivate, this );
-        this.on( 'activate', this.activate, this );
-        this.on( 'activate', this._postActivate, this );
-        this.on( 'deactivate', this._deactivate, this );
-        this.on( 'deactivate', this.deactivate, this );
-        this.on( 'reset', this.reset, this );
-        this.on( 'ready', this._ready, this );
-        this.on( 'ready', this.ready, this );
-        /**
-         * Call parent constructor with passed arguments
-         */
-        Backbone.Model.apply( this, arguments );
-        this.on( 'change:menu', this._updateMenu, this );
-    },
-    /**
-     * Ready event callback.
+     * A selection is a collection of attachments used for a specific purpose
+     * by a media frame. e.g. Selecting an attachment (or many) to insert into
+     * post content.
      *
-     * @abstract
-     * @since 3.5.0
-     */
-    ready: function() {},
-
-    /**
-     * Activate event callback.
+     * @see media.model.Selection
+     */
+    createSelection: function() {
+        var selection = this.options.selection;
+
+        if ( ! (selection instanceof wp.media.model.Selection) ) {
+            this.options.selection = new wp.media.model.Selection( selection, {
+                multiple: this.options.multiple
+            });
+        }
+
+        this._selection = {
+            attachments: new wp.media.model.Attachments(),
+            difference: []
+        };
+    },
+
+    /**
+     * Create the default states on the frame.
+     */
+    createStates: function() {
+        var options = this.options;
+
+        if ( this.options.states ) {
+            return;
+        }
+
+        // Add the default states.
+        this.states.add([
+            // Main states.
+            new wp.media.controller.Library({
+                library:   wp.media.query( options.library ),
+                multiple:  options.multiple,
+                title:     options.title,
+                priority:  20
+            })
+        ]);
+    },
+
+    /**
+     * Bind region mode event callbacks.
      *
-     * @abstract
-     * @since 3.5.0
-     */
-    activate: function() {},
-
-    /**
-     * Deactivate event callback.
+     * @see media.controller.Region.render
+     */
+    bindHandlers: function() {
+        this.on( 'router:create:browse', this.createRouter, this );
+        this.on( 'router:render:browse', this.browseRouter, this );
+        this.on( 'content:create:browse', this.browseContent, this );
+        this.on( 'content:render:upload', this.uploadContent, this );
+        this.on( 'toolbar:create:select', this.createSelectToolbar, this );
+    },
+
+    /**
+     * Render callback for the router region in the `browse` mode.
      *
-     * @abstract
-     * @since 3.5.0
-     */
-    deactivate: function() {},
-
-    /**
-     * Reset event callback.
+     * @param {wp.media.view.Router} routerView
+     */
+    browseRouter: function( routerView ) {
+        routerView.set({
+            upload: {
+                text:     l10n.uploadFilesTitle,
+                priority: 20
+            },
+            browse: {
+                text:     l10n.mediaLibraryTitle,
+                priority: 40
+            }
+        });
+    },
+
+    /**
+     * Render callback for the content region in the `browse` mode.
      *
-     * @abstract
-     * @since 3.5.0
-     */
-    reset: function() {},
-
-    /**
-     * @access private
-     * @since 3.5.0
-     */
-    _ready: function() {
-        this._updateMenu();
-    },
-
-    /**
-     * @access private
-     * @since 3.5.0
-    */
-    _preActivate: function() {
-        this.active = true;
-    },
-
-    /**
-     * @access private
-     * @since 3.5.0
-     */
-    _postActivate: function() {
-        this.on( 'change:menu', this._menu, this );
-        this.on( 'change:titleMode', this._title, this );
-        this.on( 'change:content', this._content, this );
-        this.on( 'change:toolbar', this._toolbar, this );
-
-        this.frame.on( 'title:render:default', this._renderTitle, this );
-
-        this._title();
-        this._menu();
-        this._toolbar();
-        this._content();
-        this._router();
-    },
-
-    /**
-     * @access private
-     * @since 3.5.0
-     */
-    _deactivate: function() {
-        this.active = false;
-
-        this.frame.off( 'title:render:default', this._renderTitle, this );
-
-        this.off( 'change:menu', this._menu, this );
-        this.off( 'change:titleMode', this._title, this );
-        this.off( 'change:content', this._content, this );
-        this.off( 'change:toolbar', this._toolbar, this );
-    },
-
-    /**
-     * @access private
-     * @since 3.5.0
-     */
-    _title: function() {
-        this.frame.title.render( this.get('titleMode') || 'default' );
-    },
-
-    /**
-     * @access private
-     * @since 3.5.0
-     */
-    _renderTitle: function( view ) {
-        view.$el.text( this.get('title') || '' );
-    },
-
-    /**
-     * @access private
-     * @since 3.5.0
-     */
-    _router: function() {
-        var router = this.frame.router,
-            mode = this.get('router'),
-            view;
-
-        this.frame.$el.toggleClass( 'hide-router', ! mode );
-        if ( ! mode ) {
-            return;
-        }
-
-        this.frame.router.render( mode );
-
-        view = router.get();
-        if ( view && view.select ) {
-            view.select( this.frame.content.mode() );
-        }
-    },
-
-    /**
-     * @access private
-     * @since 3.5.0
-     */
-    _menu: function() {
-        var menu = this.frame.menu,
-            mode = this.get('menu'),
-            view;
-
-        this.frame.$el.toggleClass( 'hide-menu', ! mode );
-        if ( ! mode ) {
-            return;
-        }
-
-        menu.mode( mode );
-
-        view = menu.get();
-        if ( view && view.select ) {
-            view.select( this.id );
-        }
-    },
-
-    /**
-     * @access private
-     * @since 3.5.0
-     */
-    _updateMenu: function() {
-        var previous = this.previous('menu'),
-            menu = this.get('menu');
-
-        if ( previous ) {
-            this.frame.off( 'menu:render:' + previous, this._renderMenu, this );
-        }
-
-        if ( menu ) {
-            this.frame.on( 'menu:render:' + menu, this._renderMenu, this );
-        }
-    },
-
-    /**
-     * Create a view in the media menu for the state.
+     * @param {wp.media.controller.Region} contentRegion
+     */
+    browseContent: function( contentRegion ) {
+        var state = this.state();
+
+        this.$el.removeClass('hide-toolbar');
+
+        // Browse our library of attachments.
+        contentRegion.view = new wp.media.view.AttachmentsBrowser({
+            controller: this,
+            collection: state.get('library'),
+            selection:  state.get('selection'),
+            model:      state,
+            sortable:   state.get('sortable'),
+            search:     state.get('searchable'),
+            filters:    state.get('filterable'),
+            date:       state.get('date'),
+            display:    state.has('display') ? state.get('display') : state.get('displaySettings'),
+            dragInfo:   state.get('dragInfo'),
+
+            idealColumnWidth: state.get('idealColumnWidth'),
+            suggestedWidth:   state.get('suggestedWidth'),
+            suggestedHeight:  state.get('suggestedHeight'),
+
+            AttachmentView: state.get('AttachmentView')
+        });
+    },
+
+    /**
+     * Render callback for the content region in the `upload` mode.
+     */
+    uploadContent: function() {
+        this.$el.removeClass( 'hide-toolbar' );
+        this.content.set( new wp.media.view.UploaderInline({
+            controller: this
+        }) );
+    },
+
+    /**
+     * Toolbars
      *
-     * @access private
-     * @since 3.5.0
-     *
-     * @param {media.view.Menu} view The menu view.
-     */
-    _renderMenu: function( view ) {
-        var menuItem = this.get('menuItem'),
-            title = this.get('title'),
-            priority = this.get('priority');
-
-        if ( ! menuItem && title ) {
-            menuItem = { text: title };
-
-            if ( priority ) {
-                menuItem.priority = priority;
-            }
-        }
-
-        if ( ! menuItem ) {
-            return;
-        }
-
-        view.set( this.id, menuItem );
+     * @param {Object} toolbar
+     * @param {Object} [options={}]
+     * @this wp.media.controller.Region
+     */
+    createSelectToolbar: function( toolbar, options ) {
+        options = options || this.options.button || {};
+        options.controller = this;
+
+        toolbar.view = new wp.media.view.Toolbar.Select( options );
     }
 });
 
-_.each(['toolbar','content'], function( region ) {
-    /**
-     * @access private
-     */
-    State.prototype[ '_' + region ] = function() {
-        var mode = this.get( region );
-        if ( mode ) {
-            this.frame[ region ].render( mode );
-        }
-    };
+module.exports = Select;
+
+
+/***/ }),
+/* 49 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.MediaFrame.Post
+ *
+ * The frame for manipulating media on the Edit Post page.
+ *
+ * @class
+ * @augments wp.media.view.MediaFrame.Select
+ * @augments wp.media.view.MediaFrame
+ * @augments wp.media.view.Frame
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ * @mixes wp.media.controller.StateMachine
+ */
+var Select = wp.media.view.MediaFrame.Select,
+    Library = wp.media.controller.Library,
+    l10n = wp.media.view.l10n,
+    Post;
+
+Post = Select.extend({
+    initialize: function() {
+        this.counts = {
+            audio: {
+                count: wp.media.view.settings.attachmentCounts.audio,
+                state: 'playlist'
+            },
+            video: {
+                count: wp.media.view.settings.attachmentCounts.video,
+                state: 'video-playlist'
+            }
+        };
+
+        _.defaults( this.options, {
+            multiple:  true,
+            editing:   false,
+            state:    'insert',
+            metadata:  {}
+        });
+
+        // Call 'initialize' directly on the parent class.
+        Select.prototype.initialize.apply( this, arguments );
+        this.createIframeStates();
+
+    },
+
+    /**
+     * Create the default states.
+     */
+    createStates: function() {
+        var options = this.options;
+
+        this.states.add([
+            // Main states.
+            new Library({
+                id:         'insert',
+                title:      l10n.insertMediaTitle,
+                priority:   20,
+                toolbar:    'main-insert',
+                filterable: 'all',
+                library:    wp.media.query( options.library ),
+                multiple:   options.multiple ? 'reset' : false,
+                editable:   true,
+
+                // If the user isn't allowed to edit fields,
+                // can they still edit it locally?
+                allowLocalEdits: true,
+
+                // Show the attachment display settings.
+                displaySettings: true,
+                // Update user settings when users adjust the
+                // attachment display settings.
+                displayUserSettings: true
+            }),
+
+            new Library({
+                id:         'gallery',
+                title:      l10n.createGalleryTitle,
+                priority:   40,
+                toolbar:    'main-gallery',
+                filterable: 'uploaded',
+                multiple:   'add',
+                editable:   false,
+
+                library:  wp.media.query( _.defaults({
+                    type: 'image'
+                }, options.library ) )
+            }),
+
+            // Embed states.
+            new wp.media.controller.Embed( { metadata: options.metadata } ),
+
+            new wp.media.controller.EditImage( { model: options.editImage } ),
+
+            // Gallery states.
+            new wp.media.controller.GalleryEdit({
+                library: options.selection,
+                editing: options.editing,
+                menu:    'gallery'
+            }),
+
+            new wp.media.controller.GalleryAdd(),
+
+            new Library({
+                id:         'playlist',
+                title:      l10n.createPlaylistTitle,
+                priority:   60,
+                toolbar:    'main-playlist',
+                filterable: 'uploaded',
+                multiple:   'add',
+                editable:   false,
+
+                library:  wp.media.query( _.defaults({
+                    type: 'audio'
+                }, options.library ) )
+            }),
+
+            // Playlist states.
+            new wp.media.controller.CollectionEdit({
+                type: 'audio',
+                collectionType: 'playlist',
+                title:          l10n.editPlaylistTitle,
+                SettingsView:   wp.media.view.Settings.Playlist,
+                library:        options.selection,
+                editing:        options.editing,
+                menu:           'playlist',
+                dragInfoText:   l10n.playlistDragInfo,
+                dragInfo:       false
+            }),
+
+            new wp.media.controller.CollectionAdd({
+                type: 'audio',
+                collectionType: 'playlist',
+                title: l10n.addToPlaylistTitle
+            }),
+
+            new Library({
+                id:         'video-playlist',
+                title:      l10n.createVideoPlaylistTitle,
+                priority:   60,
+                toolbar:    'main-video-playlist',
+                filterable: 'uploaded',
+                multiple:   'add',
+                editable:   false,
+
+                library:  wp.media.query( _.defaults({
+                    type: 'video'
+                }, options.library ) )
+            }),
+
+            new wp.media.controller.CollectionEdit({
+                type: 'video',
+                collectionType: 'playlist',
+                title:          l10n.editVideoPlaylistTitle,
+                SettingsView:   wp.media.view.Settings.Playlist,
+                library:        options.selection,
+                editing:        options.editing,
+                menu:           'video-playlist',
+                dragInfoText:   l10n.videoPlaylistDragInfo,
+                dragInfo:       false
+            }),
+
+            new wp.media.controller.CollectionAdd({
+                type: 'video',
+                collectionType: 'playlist',
+                title: l10n.addToVideoPlaylistTitle
+            })
+        ]);
+
+        if ( wp.media.view.settings.post.featuredImageId ) {
+            this.states.add( new wp.media.controller.FeaturedImage() );
+        }
+    },
+
+    bindHandlers: function() {
+        var handlers, checkCounts;
+
+        Select.prototype.bindHandlers.apply( this, arguments );
+
+        this.on( 'activate', this.activate, this );
+
+        // Only bother checking media type counts if one of the counts is zero
+        checkCounts = _.find( this.counts, function( type ) {
+            return type.count === 0;
+        } );
+
+        if ( typeof checkCounts !== 'undefined' ) {
+            this.listenTo( wp.media.model.Attachments.all, 'change:type', this.mediaTypeCounts );
+        }
+
+        this.on( 'menu:create:gallery', this.createMenu, this );
+        this.on( 'menu:create:playlist', this.createMenu, this );
+        this.on( 'menu:create:video-playlist', this.createMenu, this );
+        this.on( 'toolbar:create:main-insert', this.createToolbar, this );
+        this.on( 'toolbar:create:main-gallery', this.createToolbar, this );
+        this.on( 'toolbar:create:main-playlist', this.createToolbar, this );
+        this.on( 'toolbar:create:main-video-playlist', this.createToolbar, this );
+        this.on( 'toolbar:create:featured-image', this.featuredImageToolbar, this );
+        this.on( 'toolbar:create:main-embed', this.mainEmbedToolbar, this );
+
+        handlers = {
+            menu: {
+                'default': 'mainMenu',
+                'gallery': 'galleryMenu',
+                'playlist': 'playlistMenu',
+                'video-playlist': 'videoPlaylistMenu'
+            },
+
+            content: {
+                'embed':          'embedContent',
+                'edit-image':     'editImageContent',
+                'edit-selection': 'editSelectionContent'
+            },
+
+            toolbar: {
+                'main-insert':      'mainInsertToolbar',
+                'main-gallery':     'mainGalleryToolbar',
+                'gallery-edit':     'galleryEditToolbar',
+                'gallery-add':      'galleryAddToolbar',
+                'main-playlist':    'mainPlaylistToolbar',
+                'playlist-edit':    'playlistEditToolbar',
+                'playlist-add':     'playlistAddToolbar',
+                'main-video-playlist': 'mainVideoPlaylistToolbar',
+                'video-playlist-edit': 'videoPlaylistEditToolbar',
+                'video-playlist-add': 'videoPlaylistAddToolbar'
+            }
+        };
+
+        _.each( handlers, function( regionHandlers, region ) {
+            _.each( regionHandlers, function( callback, handler ) {
+                this.on( region + ':render:' + handler, this[ callback ], this );
+            }, this );
+        }, this );
+    },
+
+    activate: function() {
+        // Hide menu items for states tied to particular media types if there are no items
+        _.each( this.counts, function( type ) {
+            if ( type.count < 1 ) {
+                this.menuItemVisibility( type.state, 'hide' );
+            }
+        }, this );
+    },
+
+    mediaTypeCounts: function( model, attr ) {
+        if ( typeof this.counts[ attr ] !== 'undefined' && this.counts[ attr ].count < 1 ) {
+            this.counts[ attr ].count++;
+            this.menuItemVisibility( this.counts[ attr ].state, 'show' );
+        }
+    },
+
+    // Menus
+    /**
+     * @param {wp.Backbone.View} view
+     */
+    mainMenu: function( view ) {
+        view.set({
+            'library-separator': new wp.media.View({
+                className: 'separator',
+                priority: 100
+            })
+        });
+    },
+
+    menuItemVisibility: function( state, visibility ) {
+        var menu = this.menu.get();
+        if ( visibility === 'hide' ) {
+            menu.hide( state );
+        } else if ( visibility === 'show' ) {
+            menu.show( state );
+        }
+    },
+    /**
+     * @param {wp.Backbone.View} view
+     */
+    galleryMenu: function( view ) {
+        var lastState = this.lastState(),
+            previous = lastState && lastState.id,
+            frame = this;
+
+        view.set({
+            cancel: {
+                text:     l10n.cancelGalleryTitle,
+                priority: 20,
+                click:    function() {
+                    if ( previous ) {
+                        frame.setState( previous );
+                    } else {
+                        frame.close();
+                    }
+
+                    // Keep focus inside media modal
+                    // after canceling a gallery
+                    this.controller.modal.focusManager.focus();
+                }
+            },
+            separateCancel: new wp.media.View({
+                className: 'separator',
+                priority: 40
+            })
+        });
+    },
+
+    playlistMenu: function( view ) {
+        var lastState = this.lastState(),
+            previous = lastState && lastState.id,
+            frame = this;
+
+        view.set({
+            cancel: {
+                text:     l10n.cancelPlaylistTitle,
+                priority: 20,
+                click:    function() {
+                    if ( previous ) {
+                        frame.setState( previous );
+                    } else {
+                        frame.close();
+                    }
+                }
+            },
+            separateCancel: new wp.media.View({
+                className: 'separator',
+                priority: 40
+            })
+        });
+    },
+
+    videoPlaylistMenu: function( view ) {
+        var lastState = this.lastState(),
+            previous = lastState && lastState.id,
+            frame = this;
+
+        view.set({
+            cancel: {
+                text:     l10n.cancelVideoPlaylistTitle,
+                priority: 20,
+                click:    function() {
+                    if ( previous ) {
+                        frame.setState( previous );
+                    } else {
+                        frame.close();
+                    }
+                }
+            },
+            separateCancel: new wp.media.View({
+                className: 'separator',
+                priority: 40
+            })
+        });
+    },
+
+    // Content
+    embedContent: function() {
+        var view = new wp.media.view.Embed({
+            controller: this,
+            model:      this.state()
+        }).render();
+
+        this.content.set( view );
+
+        if ( ! wp.media.isTouchDevice ) {
+            view.url.focus();
+        }
+    },
+
+    editSelectionContent: function() {
+        var state = this.state(),
+            selection = state.get('selection'),
+            view;
+
+        view = new wp.media.view.AttachmentsBrowser({
+            controller: this,
+            collection: selection,
+            selection:  selection,
+            model:      state,
+            sortable:   true,
+            search:     false,
+            date:       false,
+            dragInfo:   true,
+
+            AttachmentView: wp.media.view.Attachments.EditSelection
+        }).render();
+
+        view.toolbar.set( 'backToLibrary', {
+            text:     l10n.returnToLibrary,
+            priority: -100,
+
+            click: function() {
+                this.controller.content.mode('browse');
+            }
+        });
+
+        // Browse our library of attachments.
+        this.content.set( view );
+
+        // Trigger the controller to set focus
+        this.trigger( 'edit:selection', this );
+    },
+
+    editImageContent: function() {
+        var image = this.state().get('image'),
+            view = new wp.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();
+
+    },
+
+    // Toolbars
+
+    /**
+     * @param {wp.Backbone.View} view
+     */
+    selectionStatusToolbar: function( view ) {
+        var editable = this.state().get('editable');
+
+        view.set( 'selection', new wp.media.view.Selection({
+            controller: this,
+            collection: this.state().get('selection'),
+            priority:   -40,
+
+            // If the selection is editable, pass the callback to
+            // switch the content mode.
+            editable: editable && function() {
+                this.controller.content.mode('edit-selection');
+            }
+        }).render() );
+    },
+
+    /**
+     * @param {wp.Backbone.View} view
+     */
+    mainInsertToolbar: function( view ) {
+        var controller = this;
+
+        this.selectionStatusToolbar( view );
+
+        view.set( 'insert', {
+            style:    'primary',
+            priority: 80,
+            text:     l10n.insertIntoPost,
+            requires: { selection: true },
+
+            /**
+             * @fires wp.media.controller.State#insert
+             */
+            click: function() {
+                var state = controller.state(),
+                    selection = state.get('selection');
+
+                controller.close();
+                state.trigger( 'insert', selection ).reset();
+            }
+        });
+    },
+
+    /**
+     * @param {wp.Backbone.View} view
+     */
+    mainGalleryToolbar: function( view ) {
+        var controller = this;
+
+        this.selectionStatusToolbar( view );
+
+        view.set( 'gallery', {
+            style:    'primary',
+            text:     l10n.createNewGallery,
+            priority: 60,
+            requires: { selection: true },
+
+            click: function() {
+                var selection = controller.state().get('selection'),
+                    edit = controller.state('gallery-edit'),
+                    models = selection.where({ type: 'image' });
+
+                edit.set( 'library', new wp.media.model.Selection( models, {
+                    props:    selection.props.toJSON(),
+                    multiple: true
+                }) );
+
+                this.controller.setState('gallery-edit');
+
+                // Keep focus inside media modal
+                // after jumping to gallery view
+                this.controller.modal.focusManager.focus();
+            }
+        });
+    },
+
+    mainPlaylistToolbar: function( view ) {
+        var controller = this;
+
+        this.selectionStatusToolbar( view );
+
+        view.set( 'playlist', {
+            style:    'primary',
+            text:     l10n.createNewPlaylist,
+            priority: 100,
+            requires: { selection: true },
+
+            click: function() {
+                var selection = controller.state().get('selection'),
+                    edit = controller.state('playlist-edit'),
+                    models = selection.where({ type: 'audio' });
+
+                edit.set( 'library', new wp.media.model.Selection( models, {
+                    props:    selection.props.toJSON(),
+                    multiple: true
+                }) );
+
+                this.controller.setState('playlist-edit');
+
+                // Keep focus inside media modal
+                // after jumping to playlist view
+                this.controller.modal.focusManager.focus();
+            }
+        });
+    },
+
+    mainVideoPlaylistToolbar: function( view ) {
+        var controller = this;
+
+        this.selectionStatusToolbar( view );
+
+        view.set( 'video-playlist', {
+            style:    'primary',
+            text:     l10n.createNewVideoPlaylist,
+            priority: 100,
+            requires: { selection: true },
+
+            click: function() {
+                var selection = controller.state().get('selection'),
+                    edit = controller.state('video-playlist-edit'),
+                    models = selection.where({ type: 'video' });
+
+                edit.set( 'library', new wp.media.model.Selection( models, {
+                    props:    selection.props.toJSON(),
+                    multiple: true
+                }) );
+
+                this.controller.setState('video-playlist-edit');
+
+                // Keep focus inside media modal
+                // after jumping to video playlist view
+                this.controller.modal.focusManager.focus();
+            }
+        });
+    },
+
+    featuredImageToolbar: function( toolbar ) {
+        this.createSelectToolbar( toolbar, {
+            text:  l10n.setFeaturedImage,
+            state: this.options.state
+        });
+    },
+
+    mainEmbedToolbar: function( toolbar ) {
+        toolbar.view = new wp.media.view.Toolbar.Embed({
+            controller: this
+        });
+    },
+
+    galleryEditToolbar: function() {
+        var editing = this.state().get('editing');
+        this.toolbar.set( new wp.media.view.Toolbar({
+            controller: this,
+            items: {
+                insert: {
+                    style:    'primary',
+                    text:     editing ? l10n.updateGallery : l10n.insertGallery,
+                    priority: 80,
+                    requires: { library: true },
+
+                    /**
+                     * @fires wp.media.controller.State#update
+                     */
+                    click: function() {
+                        var controller = this.controller,
+                            state = controller.state();
+
+                        controller.close();
+                        state.trigger( 'update', state.get('library') );
+
+                        // Restore and reset the default state.
+                        controller.setState( controller.options.state );
+                        controller.reset();
+                    }
+                }
+            }
+        }) );
+    },
+
+    galleryAddToolbar: function() {
+        this.toolbar.set( new wp.media.view.Toolbar({
+            controller: this,
+            items: {
+                insert: {
+                    style:    'primary',
+                    text:     l10n.addToGallery,
+                    priority: 80,
+                    requires: { selection: true },
+
+                    /**
+                     * @fires wp.media.controller.State#reset
+                     */
+                    click: function() {
+                        var controller = this.controller,
+                            state = controller.state(),
+                            edit = controller.state('gallery-edit');
+
+                        edit.get('library').add( state.get('selection').models );
+                        state.trigger('reset');
+                        controller.setState('gallery-edit');
+                    }
+                }
+            }
+        }) );
+    },
+
+    playlistEditToolbar: function() {
+        var editing = this.state().get('editing');
+        this.toolbar.set( new wp.media.view.Toolbar({
+            controller: this,
+            items: {
+                insert: {
+                    style:    'primary',
+                    text:     editing ? l10n.updatePlaylist : l10n.insertPlaylist,
+                    priority: 80,
+                    requires: { library: true },
+
+                    /**
+                     * @fires wp.media.controller.State#update
+                     */
+                    click: function() {
+                        var controller = this.controller,
+                            state = controller.state();
+
+                        controller.close();
+                        state.trigger( 'update', state.get('library') );
+
+                        // Restore and reset the default state.
+                        controller.setState( controller.options.state );
+                        controller.reset();
+                    }
+                }
+            }
+        }) );
+    },
+
+    playlistAddToolbar: function() {
+        this.toolbar.set( new wp.media.view.Toolbar({
+            controller: this,
+            items: {
+                insert: {
+                    style:    'primary',
+                    text:     l10n.addToPlaylist,
+                    priority: 80,
+                    requires: { selection: true },
+
+                    /**
+                     * @fires wp.media.controller.State#reset
+                     */
+                    click: function() {
+                        var controller = this.controller,
+                            state = controller.state(),
+                            edit = controller.state('playlist-edit');
+
+                        edit.get('library').add( state.get('selection').models );
+                        state.trigger('reset');
+                        controller.setState('playlist-edit');
+                    }
+                }
+            }
+        }) );
+    },
+
+    videoPlaylistEditToolbar: function() {
+        var editing = this.state().get('editing');
+        this.toolbar.set( new wp.media.view.Toolbar({
+            controller: this,
+            items: {
+                insert: {
+                    style:    'primary',
+                    text:     editing ? l10n.updateVideoPlaylist : l10n.insertVideoPlaylist,
+                    priority: 140,
+                    requires: { library: true },
+
+                    click: function() {
+                        var controller = this.controller,
+                            state = controller.state(),
+                            library = state.get('library');
+
+                        library.type = 'video';
+
+                        controller.close();
+                        state.trigger( 'update', library );
+
+                        // Restore and reset the default state.
+                        controller.setState( controller.options.state );
+                        controller.reset();
+                    }
+                }
+            }
+        }) );
+    },
+
+    videoPlaylistAddToolbar: function() {
+        this.toolbar.set( new wp.media.view.Toolbar({
+            controller: this,
+            items: {
+                insert: {
+                    style:    'primary',
+                    text:     l10n.addToVideoPlaylist,
+                    priority: 140,
+                    requires: { selection: true },
+
+                    click: function() {
+                        var controller = this.controller,
+                            state = controller.state(),
+                            edit = controller.state('video-playlist-edit');
+
+                        edit.get('library').add( state.get('selection').models );
+                        state.trigger('reset');
+                        controller.setState('video-playlist-edit');
+                    }
+                }
+            }
+        }) );
+    }
 });
 
-module.exports = State;
-
-},{}],18:[function(require,module,exports){
+module.exports = Post;
+
+
+/***/ }),
+/* 50 */
+/***/ (function(module, exports) {
+
 /**
- * wp.media.selectionSync
- *
- * Sync an attachments selection in a state with another state.
- *
- * Allows for selecting multiple images in the Insert Media workflow, and then
- * switching to the Insert Gallery workflow while preserving the attachments selection.
- *
- * @mixin
+ * wp.media.view.MediaFrame.ImageDetails
+ *
+ * A media frame for manipulating an image that's already been inserted
+ * into a post.
+ *
+ * @class
+ * @augments wp.media.view.MediaFrame.Select
+ * @augments wp.media.view.MediaFrame
+ * @augments wp.media.view.Frame
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ * @mixes wp.media.controller.StateMachine
  */
-var selectionSync = {
-    /**
-     * @since 3.5.0
-     */
-    syncSelection: function() {
-        var selection = this.get('selection'),
-            manager = this.frame._selection;
-
-        if ( ! this.get('syncSelection') || ! manager || ! selection ) {
+var Select = wp.media.view.MediaFrame.Select,
+    l10n = wp.media.view.l10n,
+    ImageDetails;
+
+ImageDetails = Select.extend({
+    defaults: {
+        id:      'image',
+        url:     '',
+        menu:    'image-details',
+        content: 'image-details',
+        toolbar: 'image-details',
+        type:    'link',
+        title:    l10n.imageDetailsTitle,
+        priority: 120
+    },
+
+    initialize: function( options ) {
+        this.image = new wp.media.model.PostImage( options.metadata );
+        this.options.selection = new wp.media.model.Selection( this.image.attachment, { multiple: false } );
+        Select.prototype.initialize.apply( this, arguments );
+    },
+
+    bindHandlers: function() {
+        Select.prototype.bindHandlers.apply( this, arguments );
+        this.on( 'menu:create:image-details', this.createMenu, this );
+        this.on( 'content:create:image-details', this.imageDetailsContent, this );
+        this.on( 'content:render:edit-image', this.editImageContent, this );
+        this.on( 'toolbar:render:image-details', this.renderImageDetailsToolbar, this );
+        // override the select toolbar
+        this.on( 'toolbar:render:replace', this.renderReplaceImageToolbar, this );
+    },
+
+    createStates: function() {
+        this.states.add([
+            new wp.media.controller.ImageDetails({
+                image: this.image,
+                editable: false
+            }),
+            new wp.media.controller.ReplaceImage({
+                id: 'replace-image',
+                library: wp.media.query( { type: 'image' } ),
+                image: this.image,
+                multiple:  false,
+                title:     l10n.imageReplaceTitle,
+                toolbar: 'replace',
+                priority:  80,
+                displaySettings: true
+            }),
+            new wp.media.controller.EditImage( {
+                image: this.image,
+                selection: this.options.selection
+            } )
+        ]);
+    },
+
+    imageDetailsContent: function( options ) {
+        options.view = new wp.media.view.ImageDetails({
+            controller: this,
+            model: this.state().image,
+            attachment: this.state().image.attachment
+        });
+    },
+
+    editImageContent: function() {
+        var state = this.state(),
+            model = state.get('image'),
+            view;
+
+        if ( ! model ) {
             return;
         }
 
-        // If the selection supports multiple items, validate the stored
-        // attachments based on the new selection's conditions. Record
-        // the attachments that are not included; we'll maintain a
-        // reference to those. Other attachments are considered in flux.
-        if ( selection.multiple ) {
-            selection.reset( [], { silent: true });
-            selection.validateAll( manager.attachments );
-            manager.difference = _.difference( manager.attachments.models, selection.models );
-        }
-
-        // Sync the selection's single item with the master.
-        selection.single( manager.single );
-    },
-
-    /**
-     * Record the currently active attachments, which is a combination
-     * of the selection's attachments and the set of selected
-     * attachments that this specific selection considered invalid.
-     * Reset the difference and record the single attachment.
+        view = new wp.media.view.EditImage( { model: model, controller: this } ).render();
+
+        this.content.set( view );
+
+        // after bringing in the frame, load the actual editor via an ajax call
+        view.loadEditor();
+
+    },
+
+    renderImageDetailsToolbar: function() {
+        this.toolbar.set( new wp.media.view.Toolbar({
+            controller: this,
+            items: {
+                select: {
+                    style:    'primary',
+                    text:     l10n.update,
+                    priority: 80,
+
+                    click: function() {
+                        var controller = this.controller,
+                            state = controller.state();
+
+                        controller.close();
+
+                        // not sure if we want to use wp.media.string.image which will create a shortcode or
+                        // perhaps wp.html.string to at least to build the <img />
+                        state.trigger( 'update', controller.image.toJSON() );
+
+                        // Restore and reset the default state.
+                        controller.setState( controller.options.state );
+                        controller.reset();
+                    }
+                }
+            }
+        }) );
+    },
+
+    renderReplaceImageToolbar: function() {
+        var frame = this,
+            lastState = frame.lastState(),
+            previous = lastState && lastState.id;
+
+        this.toolbar.set( new wp.media.view.Toolbar({
+            controller: this,
+            items: {
+                back: {
+                    text:     l10n.back,
+                    priority: 20,
+                    click:    function() {
+                        if ( previous ) {
+                            frame.setState( previous );
+                        } else {
+                            frame.close();
+                        }
+                    }
+                },
+
+                replace: {
+                    style:    'primary',
+                    text:     l10n.replace,
+                    priority: 80,
+
+                    click: function() {
+                        var controller = this.controller,
+                            state = controller.state(),
+                            selection = state.get( 'selection' ),
+                            attachment = selection.single();
+
+                        controller.close();
+
+                        controller.image.changeAttachment( attachment, state.display( attachment ) );
+
+                        // not sure if we want to use wp.media.string.image which will create a shortcode or
+                        // perhaps wp.html.string to at least to build the <img />
+                        state.trigger( 'replace', controller.image.toJSON() );
+
+                        // Restore and reset the default state.
+                        controller.setState( controller.options.state );
+                        controller.reset();
+                    }
+                }
+            }
+        }) );
+    }
+
+});
+
+module.exports = ImageDetails;
+
+
+/***/ }),
+/* 51 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.Modal
+ *
+ * A modal view, which the media modal uses as its default container.
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var $ = jQuery,
+    Modal;
+
+Modal = wp.media.View.extend({
+    tagName:  'div',
+    template: wp.template('media-modal'),
+
+    attributes: {
+        tabindex: 0
+    },
+
+    events: {
+        'click .media-modal-backdrop, .media-modal-close': 'escapeHandler',
+        'keydown': 'keydown'
+    },
+
+    initialize: function() {
+        _.defaults( this.options, {
+            container: document.body,
+            title:     '',
+            propagate: true,
+            freeze:    true
+        });
+
+        this.focusManager = new wp.media.view.FocusManager({
+            el: this.el
+        });
+    },
+    /**
+     * @returns {Object}
+     */
+    prepare: function() {
+        return {
+            title: this.options.title
+        };
+    },
+
+    /**
+     * @returns {wp.media.view.Modal} Returns itself to allow chaining
+     */
+    attach: function() {
+        if ( this.views.attached ) {
+            return this;
+        }
+
+        if ( ! this.views.rendered ) {
+            this.render();
+        }
+
+        this.$el.appendTo( this.options.container );
+
+        // Manually mark the view as attached and trigger ready.
+        this.views.attached = true;
+        this.views.ready();
+
+        return this.propagate('attach');
+    },
+
+    /**
+     * @returns {wp.media.view.Modal} Returns itself to allow chaining
+     */
+    detach: function() {
+        if ( this.$el.is(':visible') ) {
+            this.close();
+        }
+
+        this.$el.detach();
+        this.views.attached = false;
+        return this.propagate('detach');
+    },
+
+    /**
+     * @returns {wp.media.view.Modal} Returns itself to allow chaining
+     */
+    open: function() {
+        var $el = this.$el,
+            options = this.options,
+            mceEditor;
+
+        if ( $el.is(':visible') ) {
+            return this;
+        }
+
+        if ( ! this.views.attached ) {
+            this.attach();
+        }
+
+        // If the `freeze` option is set, record the window's scroll position.
+        if ( options.freeze ) {
+            this._freeze = {
+                scrollTop: $( window ).scrollTop()
+            };
+        }
+
+        // Disable page scrolling.
+        $( 'body' ).addClass( 'modal-open' );
+
+        $el.show();
+
+        // Try to close the onscreen keyboard
+        if ( 'ontouchend' in document ) {
+            if ( ( mceEditor = window.tinymce && window.tinymce.activeEditor )  && ! mceEditor.isHidden() && mceEditor.iframeElement ) {
+                mceEditor.iframeElement.focus();
+                mceEditor.iframeElement.blur();
+
+                setTimeout( function() {
+                    mceEditor.iframeElement.blur();
+                }, 100 );
+            }
+        }
+
+        this.$el.focus();
+
+        return this.propagate('open');
+    },
+
+    /**
+     * @param {Object} options
+     * @returns {wp.media.view.Modal} Returns itself to allow chaining
+     */
+    close: function( options ) {
+        var freeze = this._freeze;
+
+        if ( ! this.views.attached || ! this.$el.is(':visible') ) {
+            return this;
+        }
+
+        // Enable page scrolling.
+        $( 'body' ).removeClass( 'modal-open' );
+
+        // Hide modal and remove restricted media modal tab focus once it's closed
+        this.$el.hide().undelegate( 'keydown' );
+
+        // Put focus back in useful location once modal is closed
+        $('#wpbody-content').focus();
+
+        this.propagate('close');
+
+        // If the `freeze` option is set, restore the container's scroll position.
+        if ( freeze ) {
+            $( window ).scrollTop( freeze.scrollTop );
+        }
+
+        if ( options && options.escape ) {
+            this.propagate('escape');
+        }
+
+        return this;
+    },
+    /**
+     * @returns {wp.media.view.Modal} Returns itself to allow chaining
+     */
+    escape: function() {
+        return this.close({ escape: true });
+    },
+    /**
+     * @param {Object} event
+     */
+    escapeHandler: function( event ) {
+        event.preventDefault();
+        this.escape();
+    },
+
+    /**
+     * @param {Array|Object} content Views to register to '.media-modal-content'
+     * @returns {wp.media.view.Modal} Returns itself to allow chaining
+     */
+    content: function( content ) {
+        this.views.set( '.media-modal-content', content );
+        return this;
+    },
+
+    /**
+     * Triggers a modal event and if the `propagate` option is set,
+     * forwards events to the modal's controller.
      *
-     * @since 3.5.0
-     */
-    recordSelection: function() {
-        var selection = this.get('selection'),
-            manager = this.frame._selection;
-
-        if ( ! this.get('syncSelection') || ! manager || ! selection ) {
+     * @param {string} id
+     * @returns {wp.media.view.Modal} Returns itself to allow chaining
+     */
+    propagate: function( id ) {
+        this.trigger( id );
+
+        if ( this.options.propagate ) {
+            this.controller.trigger( id );
+        }
+
+        return this;
+    },
+    /**
+     * @param {Object} event
+     */
+    keydown: function( event ) {
+        // Close the modal when escape is pressed.
+        if ( 27 === event.which && this.$el.is(':visible') ) {
+            this.escape();
+            event.stopImmediatePropagation();
+        }
+    }
+});
+
+module.exports = Modal;
+
+
+/***/ }),
+/* 52 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.FocusManager
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var FocusManager = wp.media.View.extend({
+
+    events: {
+        'keydown': 'constrainTabbing'
+    },
+
+    focus: function() { // Reset focus on first left menu item
+        this.$('.media-menu-item').first().focus();
+    },
+    /**
+     * @param {Object} event
+     */
+    constrainTabbing: function( event ) {
+        var tabbables;
+
+        // Look for the tab key.
+        if ( 9 !== event.keyCode ) {
             return;
         }
 
-        if ( selection.multiple ) {
-            manager.attachments.reset( selection.toArray().concat( manager.difference ) );
-            manager.difference = [];
-        } else {
-            manager.attachments.add( selection.toArray() );
-        }
-
-        manager.single = selection._single;
+        // Skip the file input added by Plupload.
+        tabbables = this.$( ':tabbable' ).not( '.moxie-shim input[type="file"]' );
+
+        // Keep tab focus within media modal while it's open
+        if ( tabbables.last()[0] === event.target && ! event.shiftKey ) {
+            tabbables.first().focus();
+            return false;
+        } else if ( tabbables.first()[0] === event.target && event.shiftKey ) {
+            tabbables.last().focus();
+            return false;
+        }
     }
-};
-
-module.exports = selectionSync;
-
-},{}],19:[function(require,module,exports){
-var media = wp.media,
-    $ = jQuery,
-    l10n;
-
-media.isTouchDevice = ( 'ontouchend' in document );
-
-// Link any localized strings.
-l10n = media.view.l10n = window._wpMediaViewsL10n || {};
-
-// Link any settings.
-media.view.settings = l10n.settings || {};
-delete l10n.settings;
-
-// Copy the `post` setting over to the model settings.
-media.model.settings.post = media.view.settings.post;
-
-// Check if the browser supports CSS 3.0 transitions
-$.support.transition = (function(){
-    var style = document.documentElement.style,
-        transitions = {
-            WebkitTransition: 'webkitTransitionEnd',
-            MozTransition:    'transitionend',
-            OTransition:      'oTransitionEnd otransitionend',
-            transition:       'transitionend'
-        }, transition;
-
-    transition = _.find( _.keys( transitions ), function( transition ) {
-        return ! _.isUndefined( style[ transition ] );
-    });
-
-    return transition && {
-        end: transitions[ transition ]
-    };
-}());
+
+});
+
+module.exports = FocusManager;
+
+
+/***/ }),
+/* 53 */
+/***/ (function(module, exports) {
 
 /**
- * A shared event bus used to provide events into
- * the media workflows that 3rd-party devs can use to hook
- * in.
+ * wp.media.view.UploaderWindow
+ *
+ * An uploader window that allows for dragging and dropping media.
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ *
+ * @param {object} [options]                   Options hash passed to the view.
+ * @param {object} [options.uploader]          Uploader properties.
+ * @param {jQuery} [options.uploader.browser]
+ * @param {jQuery} [options.uploader.dropzone] jQuery collection of the dropzone.
+ * @param {object} [options.uploader.params]
  */
-media.events = _.extend( {}, Backbone.Events );
+var $ = jQuery,
+    UploaderWindow;
+
+UploaderWindow = wp.media.View.extend({
+    tagName:   'div',
+    className: 'uploader-window',
+    template:  wp.template('uploader-window'),
+
+    initialize: function() {
+        var uploader;
+
+        this.$browser = $('<a href="#" class="browser" />').hide().appendTo('body');
+
+        uploader = this.options.uploader = _.defaults( this.options.uploader || {}, {
+            dropzone:  this.$el,
+            browser:   this.$browser,
+            params:    {}
+        });
+
+        // Ensure the dropzone is a jQuery collection.
+        if ( uploader.dropzone && ! (uploader.dropzone instanceof $) ) {
+            uploader.dropzone = $( uploader.dropzone );
+        }
+
+        this.controller.on( 'activate', this.refresh, this );
+
+        this.controller.on( 'detach', function() {
+            this.$browser.remove();
+        }, this );
+    },
+
+    refresh: function() {
+        if ( this.uploader ) {
+            this.uploader.refresh();
+        }
+    },
+
+    ready: function() {
+        var postId = wp.media.view.settings.post.id,
+            dropzone;
+
+        // If the uploader already exists, bail.
+        if ( this.uploader ) {
+            return;
+        }
+
+        if ( postId ) {
+            this.options.uploader.params.post_id = postId;
+        }
+        this.uploader = new wp.Uploader( this.options.uploader );
+
+        dropzone = this.uploader.dropzone;
+        dropzone.on( 'dropzone:enter', _.bind( this.show, this ) );
+        dropzone.on( 'dropzone:leave', _.bind( this.hide, this ) );
+
+        $( this.uploader ).on( 'uploader:ready', _.bind( this._ready, this ) );
+    },
+
+    _ready: function() {
+        this.controller.trigger( 'uploader:ready' );
+    },
+
+    show: function() {
+        var $el = this.$el.show();
+
+        // Ensure that the animation is triggered by waiting until
+        // the transparent element is painted into the DOM.
+        _.defer( function() {
+            $el.css({ opacity: 1 });
+        });
+    },
+
+    hide: function() {
+        var $el = this.$el.css({ opacity: 0 });
+
+        wp.media.transition( $el ).done( function() {
+            // Transition end events are subject to race conditions.
+            // Make sure that the value is set as intended.
+            if ( '0' === $el.css('opacity') ) {
+                $el.hide();
+            }
+        });
+
+        // https://core.trac.wordpress.org/ticket/27341
+        _.delay( function() {
+            if ( '0' === $el.css('opacity') && $el.is(':visible') ) {
+                $el.hide();
+            }
+        }, 500 );
+    }
+});
+
+module.exports = UploaderWindow;
+
+
+/***/ }),
+/* 54 */
+/***/ (function(module, exports) {
 
 /**
- * Makes it easier to bind events using transitions.
- *
- * @param {string} selector
- * @param {Number} sensitivity
- * @returns {Promise}
- */
-media.transition = function( selector, sensitivity ) {
-    var deferred = $.Deferred();
-
-    sensitivity = sensitivity || 2000;
-
-    if ( $.support.transition ) {
-        if ( ! (selector instanceof $) ) {
-            selector = $( selector );
-        }
-
-        // Resolve the deferred when the first element finishes animating.
-        selector.first().one( $.support.transition.end, deferred.resolve );
-
-        // Just in case the event doesn't trigger, fire a callback.
-        _.delay( deferred.resolve, sensitivity );
-
-    // Otherwise, execute on the spot.
-    } else {
-        deferred.resolve();
-    }
-
-    return deferred.promise();
-};
-
-media.controller.Region = require( './controllers/region.js' );
-media.controller.StateMachine = require( './controllers/state-machine.js' );
-media.controller.State = require( './controllers/state.js' );
-
-media.selectionSync = require( './utils/selection-sync.js' );
-media.controller.Library = require( './controllers/library.js' );
-media.controller.ImageDetails = require( './controllers/image-details.js' );
-media.controller.GalleryEdit = require( './controllers/gallery-edit.js' );
-media.controller.GalleryAdd = require( './controllers/gallery-add.js' );
-media.controller.CollectionEdit = require( './controllers/collection-edit.js' );
-media.controller.CollectionAdd = require( './controllers/collection-add.js' );
-media.controller.FeaturedImage = require( './controllers/featured-image.js' );
-media.controller.ReplaceImage = require( './controllers/replace-image.js' );
-media.controller.EditImage = require( './controllers/edit-image.js' );
-media.controller.MediaLibrary = require( './controllers/media-library.js' );
-media.controller.Embed = require( './controllers/embed.js' );
-media.controller.Cropper = require( './controllers/cropper.js' );
-media.controller.CustomizeImageCropper = require( './controllers/customize-image-cropper.js' );
-media.controller.SiteIconCropper = require( './controllers/site-icon-cropper.js' );
-
-media.View = require( './views/view.js' );
-media.view.Frame = require( './views/frame.js' );
-media.view.MediaFrame = require( './views/media-frame.js' );
-media.view.MediaFrame.Select = require( './views/frame/select.js' );
-media.view.MediaFrame.Post = require( './views/frame/post.js' );
-media.view.MediaFrame.ImageDetails = require( './views/frame/image-details.js' );
-media.view.Modal = require( './views/modal.js' );
-media.view.FocusManager = require( './views/focus-manager.js' );
-media.view.UploaderWindow = require( './views/uploader/window.js' );
-media.view.EditorUploader = require( './views/uploader/editor.js' );
-media.view.UploaderInline = require( './views/uploader/inline.js' );
-media.view.UploaderStatus = require( './views/uploader/status.js' );
-media.view.UploaderStatusError = require( './views/uploader/status-error.js' );
-media.view.Toolbar = require( './views/toolbar.js' );
-media.view.Toolbar.Select = require( './views/toolbar/select.js' );
-media.view.Toolbar.Embed = require( './views/toolbar/embed.js' );
-media.view.Button = require( './views/button.js' );
-media.view.ButtonGroup = require( './views/button-group.js' );
-media.view.PriorityList = require( './views/priority-list.js' );
-media.view.MenuItem = require( './views/menu-item.js' );
-media.view.Menu = require( './views/menu.js' );
-media.view.RouterItem = require( './views/router-item.js' );
-media.view.Router = require( './views/router.js' );
-media.view.Sidebar = require( './views/sidebar.js' );
-media.view.Attachment = require( './views/attachment.js' );
-media.view.Attachment.Library = require( './views/attachment/library.js' );
-media.view.Attachment.EditLibrary = require( './views/attachment/edit-library.js' );
-media.view.Attachments = require( './views/attachments.js' );
-media.view.Search = require( './views/search.js' );
-media.view.AttachmentFilters = require( './views/attachment-filters.js' );
-media.view.DateFilter = require( './views/attachment-filters/date.js' );
-media.view.AttachmentFilters.Uploaded = require( './views/attachment-filters/uploaded.js' );
-media.view.AttachmentFilters.All = require( './views/attachment-filters/all.js' );
-media.view.AttachmentsBrowser = require( './views/attachments/browser.js' );
-media.view.Selection = require( './views/selection.js' );
-media.view.Attachment.Selection = require( './views/attachment/selection.js' );
-media.view.Attachments.Selection = require( './views/attachments/selection.js' );
-media.view.Attachment.EditSelection = require( './views/attachment/edit-selection.js' );
-media.view.Settings = require( './views/settings.js' );
-media.view.Settings.AttachmentDisplay = require( './views/settings/attachment-display.js' );
-media.view.Settings.Gallery = require( './views/settings/gallery.js' );
-media.view.Settings.Playlist = require( './views/settings/playlist.js' );
-media.view.Attachment.Details = require( './views/attachment/details.js' );
-media.view.AttachmentCompat = require( './views/attachment-compat.js' );
-media.view.Iframe = require( './views/iframe.js' );
-media.view.Embed = require( './views/embed.js' );
-media.view.Label = require( './views/label.js' );
-media.view.EmbedUrl = require( './views/embed/url.js' );
-media.view.EmbedLink = require( './views/embed/link.js' );
-media.view.EmbedImage = require( './views/embed/image.js' );
-media.view.ImageDetails = require( './views/image-details.js' );
-media.view.Cropper = require( './views/cropper.js' );
-media.view.SiteIconCropper = require( './views/site-icon-cropper.js' );
-media.view.SiteIconPreview = require( './views/site-icon-preview.js' );
-media.view.EditImage = require( './views/edit-image.js' );
-media.view.Spinner = require( './views/spinner.js' );
-
-},{"./controllers/collection-add.js":1,"./controllers/collection-edit.js":2,"./controllers/cropper.js":3,"./controllers/customize-image-cropper.js":4,"./controllers/edit-image.js":5,"./controllers/embed.js":6,"./controllers/featured-image.js":7,"./controllers/gallery-add.js":8,"./controllers/gallery-edit.js":9,"./controllers/image-details.js":10,"./controllers/library.js":11,"./controllers/media-library.js":12,"./controllers/region.js":13,"./controllers/replace-image.js":14,"./controllers/site-icon-cropper.js":15,"./controllers/state-machine.js":16,"./controllers/state.js":17,"./utils/selection-sync.js":18,"./views/attachment-compat.js":20,"./views/attachment-filters.js":21,"./views/attachment-filters/all.js":22,"./views/attachment-filters/date.js":23,"./views/attachment-filters/uploaded.js":24,"./views/attachment.js":25,"./views/attachment/details.js":26,"./views/attachment/edit-library.js":27,"./views/attachment/edit-selection.js":28,"./views/attachment/library.js":29,"./views/attachment/selection.js":30,"./views/attachments.js":31,"./views/attachments/browser.js":32,"./views/attachments/selection.js":33,"./views/button-group.js":34,"./views/button.js":35,"./views/cropper.js":36,"./views/edit-image.js":37,"./views/embed.js":38,"./views/embed/image.js":39,"./views/embed/link.js":40,"./views/embed/url.js":41,"./views/focus-manager.js":42,"./views/frame.js":43,"./views/frame/image-details.js":44,"./views/frame/post.js":45,"./views/frame/select.js":46,"./views/iframe.js":47,"./views/image-details.js":48,"./views/label.js":49,"./views/media-frame.js":50,"./views/menu-item.js":51,"./views/menu.js":52,"./views/modal.js":53,"./views/priority-list.js":54,"./views/router-item.js":55,"./views/router.js":56,"./views/search.js":57,"./views/selection.js":58,"./views/settings.js":59,"./views/settings/attachment-display.js":60,"./views/settings/gallery.js":61,"./views/settings/playlist.js":62,"./views/sidebar.js":63,"./views/site-icon-cropper.js":64,"./views/site-icon-preview.js":65,"./views/spinner.js":66,"./views/toolbar.js":67,"./views/toolbar/embed.js":68,"./views/toolbar/select.js":69,"./views/uploader/editor.js":70,"./views/uploader/inline.js":71,"./views/uploader/status-error.js":72,"./views/uploader/status.js":73,"./views/uploader/window.js":74,"./views/view.js":75}],20:[function(require,module,exports){
-/**
- * wp.media.view.AttachmentCompat
- *
- * A view to display fields added via the `attachment_fields_to_edit` filter.
+ * Creates a dropzone on WP editor instances (elements with .wp-editor-wrap)
+ * and relays drag'n'dropped files to a media workflow.
+ *
+ * wp.media.view.EditorUploader
  *
  * @class
@@ -2293 +4406 @@
  */
 var View = wp.media.View,
-    AttachmentCompat;
-
-AttachmentCompat = View.extend({
-    tagName:   'form',
-    className: 'compat-item',
+    l10n = wp.media.view.l10n,
+    $ = jQuery,
+    EditorUploader;
+
+EditorUploader = View.extend({
+    tagName:   'div',
+    className: 'uploader-editor',
+    template:  wp.template( 'uploader-editor' ),
+
+    localDrag: false,
+    overContainer: false,
+    overDropzone: false,
+    draggingFile: null,
+
+    /**
+     * Bind drag'n'drop events to callbacks.
+     */
+    initialize: function() {
+        this.initialized = false;
+
+        // Bail if not enabled or UA does not support drag'n'drop or File API.
+        if ( ! window.tinyMCEPreInit || ! window.tinyMCEPreInit.dragDropUpload || ! this.browserSupport() ) {
+            return this;
+        }
+
+        this.$document = $(document);
+        this.dropzones = [];
+        this.files = [];
+
+        this.$document.on( 'drop', '.uploader-editor', _.bind( this.drop, this ) );
+        this.$document.on( 'dragover', '.uploader-editor', _.bind( this.dropzoneDragover, this ) );
+        this.$document.on( 'dragleave', '.uploader-editor', _.bind( this.dropzoneDragleave, this ) );
+        this.$document.on( 'click', '.uploader-editor', _.bind( this.click, this ) );
+
+        this.$document.on( 'dragover', _.bind( this.containerDragover, this ) );
+        this.$document.on( 'dragleave', _.bind( this.containerDragleave, this ) );
+
+        this.$document.on( 'dragstart dragend drop', _.bind( function( event ) {
+            this.localDrag = event.type === 'dragstart';
+        }, this ) );
+
+        this.initialized = true;
+        return this;
+    },
+
+    /**
+     * Check browser support for drag'n'drop.
+     *
+     * @return Boolean
+     */
+    browserSupport: function() {
+        var supports = false, div = document.createElement('div');
+
+        supports = ( 'draggable' in div ) || ( 'ondragstart' in div && 'ondrop' in div );
+        supports = supports && !! ( window.File && window.FileList && window.FileReader );
+        return supports;
+    },
+
+    isDraggingFile: function( event ) {
+        if ( this.draggingFile !== null ) {
+            return this.draggingFile;
+        }
+
+        if ( _.isUndefined( event.originalEvent ) || _.isUndefined( event.originalEvent.dataTransfer ) ) {
+            return false;
+        }
+
+        this.draggingFile = _.indexOf( event.originalEvent.dataTransfer.types, 'Files' ) > -1 &&
+            _.indexOf( event.originalEvent.dataTransfer.types, 'text/plain' ) === -1;
+
+        return this.draggingFile;
+    },
+
+    refresh: function( e ) {
+        var dropzone_id;
+        for ( dropzone_id in this.dropzones ) {
+            // Hide the dropzones only if dragging has left the screen.
+            this.dropzones[ dropzone_id ].toggle( this.overContainer || this.overDropzone );
+        }
+
+        if ( ! _.isUndefined( e ) ) {
+            $( e.target ).closest( '.uploader-editor' ).toggleClass( 'droppable', this.overDropzone );
+        }
+
+        if ( ! this.overContainer && ! this.overDropzone ) {
+            this.draggingFile = null;
+        }
+
+        return this;
+    },
+
+    render: function() {
+        if ( ! this.initialized ) {
+            return this;
+        }
+
+        View.prototype.render.apply( this, arguments );
+        $( '.wp-editor-wrap' ).each( _.bind( this.attach, this ) );
+        return this;
+    },
+
+    attach: function( index, editor ) {
+        // Attach a dropzone to an editor.
+        var dropzone = this.$el.clone();
+        this.dropzones.push( dropzone );
+        $( editor ).append( dropzone );
+        return this;
+    },
+
+    /**
+     * When a file is dropped on the editor uploader, open up an editor media workflow
+     * and upload the file immediately.
+     *
+     * @param  {jQuery.Event} event The 'drop' event.
+     */
+    drop: function( event ) {
+        var $wrap, uploadView;
+
+        this.containerDragleave( event );
+        this.dropzoneDragleave( event );
+
+        this.files = event.originalEvent.dataTransfer.files;
+        if ( this.files.length < 1 ) {
+            return;
+        }
+
+        // Set the active editor to the drop target.
+        $wrap = $( event.target ).parents( '.wp-editor-wrap' );
+        if ( $wrap.length > 0 && $wrap[0].id ) {
+            window.wpActiveEditor = $wrap[0].id.slice( 3, -5 );
+        }
+
+        if ( ! this.workflow ) {
+            this.workflow = wp.media.editor.open( window.wpActiveEditor, {
+                frame:    'post',
+                state:    'insert',
+                title:    l10n.addMedia,
+                multiple: true
+            });
+
+            uploadView = this.workflow.uploader;
+
+            if ( uploadView.uploader && uploadView.uploader.ready ) {
+                this.addFiles.apply( this );
+            } else {
+                this.workflow.on( 'uploader:ready', this.addFiles, this );
+            }
+        } else {
+            this.workflow.state().reset();
+            this.addFiles.apply( this );
+            this.workflow.open();
+        }
+
+        return false;
+    },
+
+    /**
+     * Add the files to the uploader.
+     */
+    addFiles: function() {
+        if ( this.files.length ) {
+            this.workflow.uploader.uploader.uploader.addFile( _.toArray( this.files ) );
+            this.files = [];
+        }
+        return this;
+    },
+
+    containerDragover: function( event ) {
+        if ( this.localDrag || ! this.isDraggingFile( event ) ) {
+            return;
+        }
+
+        this.overContainer = true;
+        this.refresh();
+    },
+
+    containerDragleave: function() {
+        this.overContainer = false;
+
+        // Throttle dragleave because it's called when bouncing from some elements to others.
+        _.delay( _.bind( this.refresh, this ), 50 );
+    },
+
+    dropzoneDragover: function( event ) {
+        if ( this.localDrag || ! this.isDraggingFile( event ) ) {
+            return;
+        }
+
+        this.overDropzone = true;
+        this.refresh( event );
+        return false;
+    },
+
+    dropzoneDragleave: function( e ) {
+        this.overDropzone = false;
+        _.delay( _.bind( this.refresh, this, e ), 50 );
+    },
+
+    click: function( e ) {
+        // In the rare case where the dropzone gets stuck, hide it on click.
+        this.containerDragleave( e );
+        this.dropzoneDragleave( e );
+        this.localDrag = false;
+    }
+});
+
+module.exports = EditorUploader;
+
+
+/***/ }),
+/* 55 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.UploaderInline
+ *
+ * The inline uploader that shows up in the 'Upload Files' tab.
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var View = wp.media.View,
+    UploaderInline;
+
+UploaderInline = View.extend({
+    tagName:   'div',
+    className: 'uploader-inline',
+    template:  wp.template('uploader-inline'),
 
     events: {
-        'submit':          'preventDefault',
-        'change input':    'save',
-        'change select':   'save',
-        'change textarea': 'save'
+        'click .close': 'hide'
     },
 
     initialize: function() {
-        this.listenTo( this.model, 'change:compat', this.render );
-    },
-    /**
-     * @returns {wp.media.view.AttachmentCompat} Returns itself to allow chaining
+        _.defaults( this.options, {
+            message: '',
+            status:  true,
+            canClose: false
+        });
+
+        if ( ! this.options.$browser && this.controller.uploader ) {
+            this.options.$browser = this.controller.uploader.$browser;
+        }
+
+        if ( _.isUndefined( this.options.postId ) ) {
+            this.options.postId = wp.media.view.settings.post.id;
+        }
+
+        if ( this.options.status ) {
+            this.views.set( '.upload-inline-status', new wp.media.view.UploaderStatus({
+                controller: this.controller
+            }) );
+        }
+    },
+
+    prepare: function() {
+        var suggestedWidth = this.controller.state().get('suggestedWidth'),
+            suggestedHeight = this.controller.state().get('suggestedHeight'),
+            data = {};
+
+        data.message = this.options.message;
+        data.canClose = this.options.canClose;
+
+        if ( suggestedWidth && suggestedHeight ) {
+            data.suggestedWidth = suggestedWidth;
+            data.suggestedHeight = suggestedHeight;
+        }
+
+        return data;
+    },
+    /**
+     * @returns {wp.media.view.UploaderInline} Returns itself to allow chaining
      */
     dispose: function() {
-        if ( this.$(':focus').length ) {
-            this.save();
+        if ( this.disposing ) {
+            /**
+             * call 'dispose' directly on the parent class
+             */
+            return View.prototype.dispose.apply( this, arguments );
+        }
+
+        // Run remove on `dispose`, so we can be sure to refresh the
+        // uploader with a view-less DOM. Track whether we're disposing
+        // so we don't trigger an infinite loop.
+        this.disposing = true;
+        return this.remove();
+    },
+    /**
+     * @returns {wp.media.view.UploaderInline} Returns itself to allow chaining
+     */
+    remove: function() {
+        /**
+         * call 'remove' directly on the parent class
+         */
+        var result = View.prototype.remove.apply( this, arguments );
+
+        _.defer( _.bind( this.refresh, this ) );
+        return result;
+    },
+
+    refresh: function() {
+        var uploader = this.controller.uploader;
+
+        if ( uploader ) {
+            uploader.refresh();
+        }
+    },
+    /**
+     * @returns {wp.media.view.UploaderInline}
+     */
+    ready: function() {
+        var $browser = this.options.$browser,
+            $placeholder;
+
+        if ( this.controller.uploader ) {
+            $placeholder = this.$('.browser');
+
+            // Check if we've already replaced the placeholder.
+            if ( $placeholder[0] === $browser[0] ) {
+                return;
+            }
+
+            $browser.detach().text( $placeholder.text() );
+            $browser[0].className = $placeholder[0].className;
+            $placeholder.replaceWith( $browser.show() );
+        }
+
+        this.refresh();
+        return this;
+    },
+    show: function() {
+        this.$el.removeClass( 'hidden' );
+    },
+    hide: function() {
+        this.$el.addClass( 'hidden' );
+    }
+
+});
+
+module.exports = UploaderInline;
+
+
+/***/ }),
+/* 56 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.UploaderStatus
+ *
+ * An uploader status for on-going uploads.
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var View = wp.media.View,
+    UploaderStatus;
+
+UploaderStatus = View.extend({
+    className: 'media-uploader-status',
+    template:  wp.template('uploader-status'),
+
+    events: {
+        'click .upload-dismiss-errors': 'dismiss'
+    },
+
+    initialize: function() {
+        this.queue = wp.Uploader.queue;
+        this.queue.on( 'add remove reset', this.visibility, this );
+        this.queue.on( 'add remove reset change:percent', this.progress, this );
+        this.queue.on( 'add remove reset change:uploading', this.info, this );
+
+        this.errors = wp.Uploader.errors;
+        this.errors.reset();
+        this.errors.on( 'add remove reset', this.visibility, this );
+        this.errors.on( 'add', this.error, this );
+    },
+    /**
+     * @global wp.Uploader
+     * @returns {wp.media.view.UploaderStatus}
+     */
+    dispose: function() {
+        wp.Uploader.queue.off( null, null, this );
+        /**
+         * call 'dispose' directly on the parent class
+         */
+        View.prototype.dispose.apply( this, arguments );
+        return this;
+    },
+
+    visibility: function() {
+        this.$el.toggleClass( 'uploading', !! this.queue.length );
+        this.$el.toggleClass( 'errors', !! this.errors.length );
+        this.$el.toggle( !! this.queue.length || !! this.errors.length );
+    },
+
+    ready: function() {
+        _.each({
+            '$bar':      '.media-progress-bar div',
+            '$index':    '.upload-index',
+            '$total':    '.upload-total',
+            '$filename': '.upload-filename'
+        }, function( selector, key ) {
+            this[ key ] = this.$( selector );
+        }, this );
+
+        this.visibility();
+        this.progress();
+        this.info();
+    },
+
+    progress: function() {
+        var queue = this.queue,
+            $bar = this.$bar;
+
+        if ( ! $bar || ! queue.length ) {
+            return;
+        }
+
+        $bar.width( ( queue.reduce( function( memo, attachment ) {
+            if ( ! attachment.get('uploading') ) {
+                return memo + 100;
+            }
+
+            var percent = attachment.get('percent');
+            return memo + ( _.isNumber( percent ) ? percent : 100 );
+        }, 0 ) / queue.length ) + '%' );
+    },
+
+    info: function() {
+        var queue = this.queue,
+            index = 0, active;
+
+        if ( ! queue.length ) {
+            return;
+        }
+
+        active = this.queue.find( function( attachment, i ) {
+            index = i;
+            return attachment.get('uploading');
+        });
+
+        this.$index.text( index + 1 );
+        this.$total.text( queue.length );
+        this.$filename.html( active ? this.filename( active.get('filename') ) : '' );
+    },
+    /**
+     * @param {string} filename
+     * @returns {string}
+     */
+    filename: function( filename ) {
+        return _.escape( filename );
+    },
+    /**
+     * @param {Backbone.Model} error
+     */
+    error: function( error ) {
+        this.views.add( '.upload-errors', new wp.media.view.UploaderStatusError({
+            filename: this.filename( error.get('file').name ),
+            message:  error.get('message')
+        }), { at: 0 });
+    },
+
+    /**
+     * @global wp.Uploader
+     *
+     * @param {Object} event
+     */
+    dismiss: function( event ) {
+        var errors = this.views.get('.upload-errors');
+
+        event.preventDefault();
+
+        if ( errors ) {
+            _.invoke( errors, 'remove' );
+        }
+        wp.Uploader.errors.reset();
+    }
+});
+
+module.exports = UploaderStatus;
+
+
+/***/ }),
+/* 57 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.UploaderStatusError
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var UploaderStatusError = wp.media.View.extend({
+    className: 'upload-error',
+    template:  wp.template('uploader-status-error')
+});
+
+module.exports = UploaderStatusError;
+
+
+/***/ }),
+/* 58 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.Toolbar
+ *
+ * A toolbar which consists of a primary and a secondary section. Each sections
+ * can be filled with views.
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var View = wp.media.View,
+    Toolbar;
+
+Toolbar = View.extend({
+    tagName:   'div',
+    className: 'media-toolbar',
+
+    initialize: function() {
+        var state = this.controller.state(),
+            selection = this.selection = state.get('selection'),
+            library = this.library = state.get('library');
+
+        this._views = {};
+
+        // The toolbar is composed of two `PriorityList` views.
+        this.primary   = new wp.media.view.PriorityList();
+        this.secondary = new wp.media.view.PriorityList();
+        this.primary.$el.addClass('media-toolbar-primary search-form');
+        this.secondary.$el.addClass('media-toolbar-secondary');
+
+        this.views.set([ this.secondary, this.primary ]);
+
+        if ( this.options.items ) {
+            this.set( this.options.items, { silent: true });
+        }
+
+        if ( ! this.options.silent ) {
+            this.render();
+        }
+
+        if ( selection ) {
+            selection.on( 'add remove reset', this.refresh, this );
+        }
+
+        if ( library ) {
+            library.on( 'add remove reset', this.refresh, this );
+        }
+    },
+    /**
+     * @returns {wp.media.view.Toolbar} Returns itsef to allow chaining
+     */
+    dispose: function() {
+        if ( this.selection ) {
+            this.selection.off( null, null, this );
+        }
+
+        if ( this.library ) {
+            this.library.off( null, null, this );
         }
         /**
@@ -2321 +4981 @@
         return View.prototype.dispose.apply( this, arguments );
     },
-    /**
-     * @returns {wp.media.view.AttachmentCompat} Returns itself to allow chaining
+
+    ready: function() {
+        this.refresh();
+    },
+
+    /**
+     * @param {string} id
+     * @param {Backbone.View|Object} view
+     * @param {Object} [options={}]
+     * @returns {wp.media.view.Toolbar} Returns itself to allow chaining
+     */
+    set: function( id, view, options ) {
+        var list;
+        options = options || {};
+
+        // Accept an object with an `id` : `view` mapping.
+        if ( _.isObject( id ) ) {
+            _.each( id, function( view, id ) {
+                this.set( id, view, { silent: true });
+            }, this );
+
+        } else {
+            if ( ! ( view instanceof Backbone.View ) ) {
+                view.classes = [ 'media-button-' + id ].concat( view.classes || [] );
+                view = new wp.media.view.Button( view ).render();
+            }
+
+            view.controller = view.controller || this.controller;
+
+            this._views[ id ] = view;
+
+            list = view.options.priority < 0 ? 'secondary' : 'primary';
+            this[ list ].set( id, view, options );
+        }
+
+        if ( ! options.silent ) {
+            this.refresh();
+        }
+
+        return this;
+    },
+    /**
+     * @param {string} id
+     * @returns {wp.media.view.Button}
+     */
+    get: function( id ) {
+        return this._views[ id ];
+    },
+    /**
+     * @param {string} id
+     * @param {Object} options
+     * @returns {wp.media.view.Toolbar} Returns itself to allow chaining
+     */
+    unset: function( id, options ) {
+        delete this._views[ id ];
+        this.primary.unset( id, options );
+        this.secondary.unset( id, options );
+
+        if ( ! options || ! options.silent ) {
+            this.refresh();
+        }
+        return this;
+    },
+
+    refresh: function() {
+        var state = this.controller.state(),
+            library = state.get('library'),
+            selection = state.get('selection');
+
+        _.each( this._views, function( button ) {
+            if ( ! button.model || ! button.options || ! button.options.requires ) {
+                return;
+            }
+
+            var requires = button.options.requires,
+                disabled = false;
+
+            // Prevent insertion of attachments if any of them are still uploading
+            disabled = _.some( selection.models, function( attachment ) {
+                return attachment.get('uploading') === true;
+            });
+
+            if ( requires.selection && selection && ! selection.length ) {
+                disabled = true;
+            } else if ( requires.library && library && ! library.length ) {
+                disabled = true;
+            }
+            button.model.set( 'disabled', disabled );
+        });
+    }
+});
+
+module.exports = Toolbar;
+
+
+/***/ }),
+/* 59 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.Toolbar.Select
+ *
+ * @class
+ * @augments wp.media.view.Toolbar
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Toolbar = wp.media.view.Toolbar,
+    l10n = wp.media.view.l10n,
+    Select;
+
+Select = Toolbar.extend({
+    initialize: function() {
+        var options = this.options;
+
+        _.bindAll( this, 'clickSelect' );
+
+        _.defaults( options, {
+            event: 'select',
+            state: false,
+            reset: true,
+            close: true,
+            text:  l10n.select,
+
+            // Does the button rely on the selection?
+            requires: {
+                selection: true
+            }
+        });
+
+        options.items = _.defaults( options.items || {}, {
+            select: {
+                style:    'primary',
+                text:     options.text,
+                priority: 80,
+                click:    this.clickSelect,
+                requires: options.requires
+            }
+        });
+        // Call 'initialize' directly on the parent class.
+        Toolbar.prototype.initialize.apply( this, arguments );
+    },
+
+    clickSelect: function() {
+        var options = this.options,
+            controller = this.controller;
+
+        if ( options.close ) {
+            controller.close();
+        }
+
+        if ( options.event ) {
+            controller.state().trigger( options.event );
+        }
+
+        if ( options.state ) {
+            controller.setState( options.state );
+        }
+
+        if ( options.reset ) {
+            controller.reset();
+        }
+    }
+});
+
+module.exports = Select;
+
+
+/***/ }),
+/* 60 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.Toolbar.Embed
+ *
+ * @class
+ * @augments wp.media.view.Toolbar.Select
+ * @augments wp.media.view.Toolbar
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Select = wp.media.view.Toolbar.Select,
+    l10n = wp.media.view.l10n,
+    Embed;
+
+Embed = Select.extend({
+    initialize: function() {
+        _.defaults( this.options, {
+            text: l10n.insertIntoPost,
+            requires: false
+        });
+        // Call 'initialize' directly on the parent class.
+        Select.prototype.initialize.apply( this, arguments );
+    },
+
+    refresh: function() {
+        var url = this.controller.state().props.get('url');
+        this.get('select').model.set( 'disabled', ! url || url === 'http://' );
+        /**
+         * call 'refresh' directly on the parent class
+         */
+        Select.prototype.refresh.apply( this, arguments );
+    }
+});
+
+module.exports = Embed;
+
+
+/***/ }),
+/* 61 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.Button
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Button = wp.media.View.extend({
+    tagName:    'button',
+    className:  'media-button',
+    attributes: { type: 'button' },
+
+    events: {
+        'click': 'click'
+    },
+
+    defaults: {
+        text:     '',
+        style:    '',
+        size:     'large',
+        disabled: false
+    },
+
+    initialize: function() {
+        /**
+         * Create a model with the provided `defaults`.
+         *
+         * @member {Backbone.Model}
+         */
+        this.model = new Backbone.Model( this.defaults );
+
+        // If any of the `options` have a key from `defaults`, apply its
+        // value to the `model` and remove it from the `options object.
+        _.each( this.defaults, function( def, key ) {
+            var value = this.options[ key ];
+            if ( _.isUndefined( value ) ) {
+                return;
+            }
+
+            this.model.set( key, value );
+            delete this.options[ key ];
+        }, this );
+
+        this.listenTo( this.model, 'change', this.render );
+    },
+    /**
+     * @returns {wp.media.view.Button} Returns itself to allow chaining
      */
     render: function() {
-        var compat = this.model.get('compat');
-        if ( ! compat || ! compat.item ) {
-            return;
-        }
-
-        this.views.detach();
-        this.$el.html( compat.item );
-        this.views.render();
+        var classes = [ 'button', this.className ],
+            model = this.model.toJSON();
+
+        if ( model.style ) {
+            classes.push( 'button-' + model.style );
+        }
+
+        if ( model.size ) {
+            classes.push( 'button-' + model.size );
+        }
+
+        classes = _.uniq( classes.concat( this.options.classes ) );
+        this.el.className = classes.join(' ');
+
+        this.$el.attr( 'disabled', model.disabled );
+        this.$el.text( this.model.get('text') );
+
         return this;
     },
@@ -2338 +5267 @@
      * @param {Object} event
      */
-    preventDefault: function( event ) {
-        event.preventDefault();
+    click: function( event ) {
+        if ( '#' === this.attributes.href ) {
+            event.preventDefault();
+        }
+
+        if ( this.options.click && ! this.model.get('disabled') ) {
+            this.options.click.apply( this, arguments );
+        }
+    }
+});
+
+module.exports = Button;
+
+
+/***/ }),
+/* 62 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.ButtonGroup
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var $ = Backbone.$,
+    ButtonGroup;
+
+ButtonGroup = wp.media.View.extend({
+    tagName:   'div',
+    className: 'button-group button-large media-button-group',
+
+    initialize: function() {
+        /**
+         * @member {wp.media.view.Button[]}
+         */
+        this.buttons = _.map( this.options.buttons || [], function( button ) {
+            if ( button instanceof Backbone.View ) {
+                return button;
+            } else {
+                return new wp.media.view.Button( button ).render();
+            }
+        });
+
+        delete this.options.buttons;
+
+        if ( this.options.classes ) {
+            this.$el.addClass( this.options.classes );
+        }
+    },
+
+    /**
+     * @returns {wp.media.view.ButtonGroup}
+     */
+    render: function() {
+        this.$el.html( $( _.pluck( this.buttons, 'el' ) ).detach() );
+        return this;
+    }
+});
+
+module.exports = ButtonGroup;
+
+
+/***/ }),
+/* 63 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.PriorityList
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var PriorityList = wp.media.View.extend({
+    tagName:   'div',
+
+    initialize: function() {
+        this._views = {};
+
+        this.set( _.extend( {}, this._views, this.options.views ), { silent: true });
+        delete this.options.views;
+
+        if ( ! this.options.silent ) {
+            this.render();
+        }
+    },
+    /**
+     * @param {string} id
+     * @param {wp.media.View|Object} view
+     * @param {Object} options
+     * @returns {wp.media.view.PriorityList} Returns itself to allow chaining
+     */
+    set: function( id, view, options ) {
+        var priority, views, index;
+
+        options = options || {};
+
+        // Accept an object with an `id` : `view` mapping.
+        if ( _.isObject( id ) ) {
+            _.each( id, function( view, id ) {
+                this.set( id, view );
+            }, this );
+            return this;
+        }
+
+        if ( ! (view instanceof Backbone.View) ) {
+            view = this.toView( view, id, options );
+        }
+        view.controller = view.controller || this.controller;
+
+        this.unset( id );
+
+        priority = view.options.priority || 10;
+        views = this.views.get() || [];
+
+        _.find( views, function( existing, i ) {
+            if ( existing.options.priority > priority ) {
+                index = i;
+                return true;
+            }
+        });
+
+        this._views[ id ] = view;
+        this.views.add( view, {
+            at: _.isNumber( index ) ? index : views.length || 0
+        });
+
+        return this;
+    },
+    /**
+     * @param {string} id
+     * @returns {wp.media.View}
+     */
+    get: function( id ) {
+        return this._views[ id ];
+    },
+    /**
+     * @param {string} id
+     * @returns {wp.media.view.PriorityList}
+     */
+    unset: function( id ) {
+        var view = this.get( id );
+
+        if ( view ) {
+            view.remove();
+        }
+
+        delete this._views[ id ];
+        return this;
+    },
+    /**
+     * @param {Object} options
+     * @returns {wp.media.View}
+     */
+    toView: function( options ) {
+        return new wp.media.View( options );
+    }
+});
+
+module.exports = PriorityList;
+
+
+/***/ }),
+/* 64 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.MenuItem
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var $ = jQuery,
+    MenuItem;
+
+MenuItem = wp.media.View.extend({
+    tagName:   'a',
+    className: 'media-menu-item',
+
+    attributes: {
+        href: '#'
+    },
+
+    events: {
+        'click': '_click'
     },
     /**
      * @param {Object} event
      */
-    save: function( event ) {
-        var data = {};
+    _click: function( event ) {
+        var clickOverride = this.options.click;
 
         if ( event ) {
@@ -2351 +5468 @@
         }
 
-        _.each( this.$el.serializeArray(), function( pair ) {
-            data[ pair.name ] = pair.value;
-        });
-
-        this.controller.trigger( 'attachment:compat:waiting', ['waiting'] );
-        this.model.saveCompat( data ).always( _.bind( this.postSave, this ) );
-    },
-
-    postSave: function() {
-        this.controller.trigger( 'attachment:compat:ready', ['ready'] );
+        if ( clickOverride ) {
+            clickOverride.call( this );
+        } else {
+            this.click();
+        }
+
+        // When selecting a tab along the left side,
+        // focus should be transferred into the main panel
+        if ( ! wp.media.isTouchDevice ) {
+            $('.media-frame-content input').first().focus();
+        }
+    },
+
+    click: function() {
+        var state = this.options.state;
+
+        if ( state ) {
+            this.controller.setState( state );
+            this.views.parent.$el.removeClass( 'visible' ); // TODO: or hide on any click, see below
+        }
+    },
+    /**
+     * @returns {wp.media.view.MenuItem} returns itself to allow chaining
+     */
+    render: function() {
+        var options = this.options;
+
+        if ( options.text ) {
+            this.$el.text( options.text );
+        } else if ( options.html ) {
+            this.$el.html( options.html );
+        }
+
+        return this;
     }
 });
 
-module.exports = AttachmentCompat;
-
-},{}],21:[function(require,module,exports){
+module.exports = MenuItem;
+
+
+/***/ }),
+/* 65 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.Menu
+ *
+ * @class
+ * @augments wp.media.view.PriorityList
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var MenuItem = wp.media.view.MenuItem,
+    PriorityList = wp.media.view.PriorityList,
+    Menu;
+
+Menu = PriorityList.extend({
+    tagName:   'div',
+    className: 'media-menu',
+    property:  'state',
+    ItemView:  MenuItem,
+    region:    'menu',
+
+    /* TODO: alternatively hide on any click anywhere
+    events: {
+        'click': 'click'
+    },
+
+    click: function() {
+        this.$el.removeClass( 'visible' );
+    },
+    */
+
+    /**
+     * @param {Object} options
+     * @param {string} id
+     * @returns {wp.media.View}
+     */
+    toView: function( options, id ) {
+        options = options || {};
+        options[ this.property ] = options[ this.property ] || id;
+        return new this.ItemView( options ).render();
+    },
+
+    ready: function() {
+        /**
+         * call 'ready' directly on the parent class
+         */
+        PriorityList.prototype.ready.apply( this, arguments );
+        this.visibility();
+    },
+
+    set: function() {
+        /**
+         * call 'set' directly on the parent class
+         */
+        PriorityList.prototype.set.apply( this, arguments );
+        this.visibility();
+    },
+
+    unset: function() {
+        /**
+         * call 'unset' directly on the parent class
+         */
+        PriorityList.prototype.unset.apply( this, arguments );
+        this.visibility();
+    },
+
+    visibility: function() {
+        var region = this.region,
+            view = this.controller[ region ].get(),
+            views = this.views.get(),
+            hide = ! views || views.length < 2;
+
+        if ( this === view ) {
+            this.controller.$el.toggleClass( 'hide-' + region, hide );
+        }
+    },
+    /**
+     * @param {string} id
+     */
+    select: function( id ) {
+        var view = this.get( id );
+
+        if ( ! view ) {
+            return;
+        }
+
+        this.deselect();
+        view.$el.addClass('active');
+    },
+
+    deselect: function() {
+        this.$el.children().removeClass('active');
+    },
+
+    hide: function( id ) {
+        var view = this.get( id );
+
+        if ( ! view ) {
+            return;
+        }
+
+        view.$el.addClass('hidden');
+    },
+
+    show: function( id ) {
+        var view = this.get( id );
+
+        if ( ! view ) {
+            return;
+        }
+
+        view.$el.removeClass('hidden');
+    }
+});
+
+module.exports = Menu;
+
+
+/***/ }),
+/* 66 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.RouterItem
+ *
+ * @class
+ * @augments wp.media.view.MenuItem
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var RouterItem = wp.media.view.MenuItem.extend({
+    /**
+     * On click handler to activate the content region's corresponding mode.
+     */
+    click: function() {
+        var contentMode = this.options.contentMode;
+        if ( contentMode ) {
+            this.controller.content.mode( contentMode );
+        }
+    }
+});
+
+module.exports = RouterItem;
+
+
+/***/ }),
+/* 67 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.Router
+ *
+ * @class
+ * @augments wp.media.view.Menu
+ * @augments wp.media.view.PriorityList
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Menu = wp.media.view.Menu,
+    Router;
+
+Router = Menu.extend({
+    tagName:   'div',
+    className: 'media-router',
+    property:  'contentMode',
+    ItemView:  wp.media.view.RouterItem,
+    region:    'router',
+
+    initialize: function() {
+        this.controller.on( 'content:render', this.update, this );
+        // Call 'initialize' directly on the parent class.
+        Menu.prototype.initialize.apply( this, arguments );
+    },
+
+    update: function() {
+        var mode = this.controller.content.mode();
+        if ( mode ) {
+            this.select( mode );
+        }
+    }
+});
+
+module.exports = Router;
+
+
+/***/ }),
+/* 68 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.Sidebar
+ *
+ * @class
+ * @augments wp.media.view.PriorityList
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Sidebar = wp.media.view.PriorityList.extend({
+    className: 'media-sidebar'
+});
+
+module.exports = Sidebar;
+
+
+/***/ }),
+/* 69 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.Attachment
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var View = wp.media.View,
+    $ = jQuery,
+    Attachment;
+
+Attachment = View.extend({
+    tagName:   'li',
+    className: 'attachment',
+    template:  wp.template('attachment'),
+
+    attributes: function() {
+        return {
+            'tabIndex':     0,
+            'role':         'checkbox',
+            'aria-label':   this.model.get( 'title' ),
+            'aria-checked': false,
+            'data-id':      this.model.get( 'id' )
+        };
+    },
+
+    events: {
+        'click .js--select-attachment':   'toggleSelectionHandler',
+        'change [data-setting]':          'updateSetting',
+        'change [data-setting] input':    'updateSetting',
+        'change [data-setting] select':   'updateSetting',
+        'change [data-setting] textarea': 'updateSetting',
+        'click .attachment-close':        'removeFromLibrary',
+        'click .check':                   'checkClickHandler',
+        'keydown':                        'toggleSelectionHandler'
+    },
+
+    buttons: {},
+
+    initialize: function() {
+        var selection = this.options.selection,
+            options = _.defaults( this.options, {
+                rerenderOnModelChange: true
+            } );
+
+        if ( options.rerenderOnModelChange ) {
+            this.listenTo( this.model, 'change', this.render );
+        } else {
+            this.listenTo( this.model, 'change:percent', this.progress );
+        }
+        this.listenTo( this.model, 'change:title', this._syncTitle );
+        this.listenTo( this.model, 'change:caption', this._syncCaption );
+        this.listenTo( this.model, 'change:artist', this._syncArtist );
+        this.listenTo( this.model, 'change:album', this._syncAlbum );
+
+        // Update the selection.
+        this.listenTo( this.model, 'add', this.select );
+        this.listenTo( this.model, 'remove', this.deselect );
+        if ( selection ) {
+            selection.on( 'reset', this.updateSelect, this );
+            // Update the model's details view.
+            this.listenTo( this.model, 'selection:single selection:unsingle', this.details );
+            this.details( this.model, this.controller.state().get('selection') );
+        }
+
+        this.listenTo( this.controller, 'attachment:compat:waiting attachment:compat:ready', this.updateSave );
+    },
+    /**
+     * @returns {wp.media.view.Attachment} Returns itself to allow chaining
+     */
+    dispose: function() {
+        var selection = this.options.selection;
+
+        // Make sure all settings are saved before removing the view.
+        this.updateAll();
+
+        if ( selection ) {
+            selection.off( null, null, this );
+        }
+        /**
+         * call 'dispose' directly on the parent class
+         */
+        View.prototype.dispose.apply( this, arguments );
+        return this;
+    },
+    /**
+     * @returns {wp.media.view.Attachment} Returns itself to allow chaining
+     */
+    render: function() {
+        var options = _.defaults( this.model.toJSON(), {
+                orientation:   'landscape',
+                uploading:     false,
+                type:          '',
+                subtype:       '',
+                icon:          '',
+                filename:      '',
+                caption:       '',
+                title:         '',
+                dateFormatted: '',
+                width:         '',
+                height:        '',
+                compat:        false,
+                alt:           '',
+                description:   ''
+            }, this.options );
+
+        options.buttons  = this.buttons;
+        options.describe = this.controller.state().get('describe');
+
+        if ( 'image' === options.type ) {
+            options.size = this.imageSize();
+        }
+
+        options.can = {};
+        if ( options.nonces ) {
+            options.can.remove = !! options.nonces['delete'];
+            options.can.save = !! options.nonces.update;
+        }
+
+        if ( this.controller.state().get('allowLocalEdits') ) {
+            options.allowLocalEdits = true;
+        }
+
+        if ( options.uploading && ! options.percent ) {
+            options.percent = 0;
+        }
+
+        this.views.detach();
+        this.$el.html( this.template( options ) );
+
+        this.$el.toggleClass( 'uploading', options.uploading );
+
+        if ( options.uploading ) {
+            this.$bar = this.$('.media-progress-bar div');
+        } else {
+            delete this.$bar;
+        }
+
+        // Check if the model is selected.
+        this.updateSelect();
+
+        // Update the save status.
+        this.updateSave();
+
+        this.views.render();
+
+        return this;
+    },
+
+    progress: function() {
+        if ( this.$bar && this.$bar.length ) {
+            this.$bar.width( this.model.get('percent') + '%' );
+        }
+    },
+
+    /**
+     * @param {Object} event
+     */
+    toggleSelectionHandler: function( event ) {
+        var method;
+
+        // Don't do anything inside inputs and on the attachment check and remove buttons.
+        if ( 'INPUT' === event.target.nodeName || 'BUTTON' === event.target.nodeName ) {
+            return;
+        }
+
+        // Catch arrow events
+        if ( 37 === event.keyCode || 38 === event.keyCode || 39 === event.keyCode || 40 === event.keyCode ) {
+            this.controller.trigger( 'attachment:keydown:arrow', event );
+            return;
+        }
+
+        // Catch enter and space events
+        if ( 'keydown' === event.type && 13 !== event.keyCode && 32 !== event.keyCode ) {
+            return;
+        }
+
+        event.preventDefault();
+
+        // In the grid view, bubble up an edit:attachment event to the controller.
+        if ( this.controller.isModeActive( 'grid' ) ) {
+            if ( this.controller.isModeActive( 'edit' ) ) {
+                // Pass the current target to restore focus when closing
+                this.controller.trigger( 'edit:attachment', this.model, event.currentTarget );
+                return;
+            }
+
+            if ( this.controller.isModeActive( 'select' ) ) {
+                method = 'toggle';
+            }
+        }
+
+        if ( event.shiftKey ) {
+            method = 'between';
+        } else if ( event.ctrlKey || event.metaKey ) {
+            method = 'toggle';
+        }
+
+        this.toggleSelection({
+            method: method
+        });
+
+        this.controller.trigger( 'selection:toggle' );
+    },
+    /**
+     * @param {Object} options
+     */
+    toggleSelection: function( options ) {
+        var collection = this.collection,
+            selection = this.options.selection,
+            model = this.model,
+            method = options && options.method,
+            single, models, singleIndex, modelIndex;
+
+        if ( ! selection ) {
+            return;
+        }
+
+        single = selection.single();
+        method = _.isUndefined( method ) ? selection.multiple : method;
+
+        // If the `method` is set to `between`, select all models that
+        // exist between the current and the selected model.
+        if ( 'between' === method && single && selection.multiple ) {
+            // If the models are the same, short-circuit.
+            if ( single === model ) {
+                return;
+            }
+
+            singleIndex = collection.indexOf( single );
+            modelIndex  = collection.indexOf( this.model );
+
+            if ( singleIndex < modelIndex ) {
+                models = collection.models.slice( singleIndex, modelIndex + 1 );
+            } else {
+                models = collection.models.slice( modelIndex, singleIndex + 1 );
+            }
+
+            selection.add( models );
+            selection.single( model );
+            return;
+
+        // If the `method` is set to `toggle`, just flip the selection
+        // status, regardless of whether the model is the single model.
+        } else if ( 'toggle' === method ) {
+            selection[ this.selected() ? 'remove' : 'add' ]( model );
+            selection.single( model );
+            return;
+        } else if ( 'add' === method ) {
+            selection.add( model );
+            selection.single( model );
+            return;
+        }
+
+        // Fixes bug that loses focus when selecting a featured image
+        if ( ! method ) {
+            method = 'add';
+        }
+
+        if ( method !== 'add' ) {
+            method = 'reset';
+        }
+
+        if ( this.selected() ) {
+            // If the model is the single model, remove it.
+            // If it is not the same as the single model,
+            // it now becomes the single model.
+            selection[ single === model ? 'remove' : 'single' ]( model );
+        } else {
+            // If the model is not selected, run the `method` on the
+            // selection. By default, we `reset` the selection, but the
+            // `method` can be set to `add` the model to the selection.
+            selection[ method ]( model );
+            selection.single( model );
+        }
+    },
+
+    updateSelect: function() {
+        this[ this.selected() ? 'select' : 'deselect' ]();
+    },
+    /**
+     * @returns {unresolved|Boolean}
+     */
+    selected: function() {
+        var selection = this.options.selection;
+        if ( selection ) {
+            return !! selection.get( this.model.cid );
+        }
+    },
+    /**
+     * @param {Backbone.Model} model
+     * @param {Backbone.Collection} collection
+     */
+    select: function( model, collection ) {
+        var selection = this.options.selection,
+            controller = this.controller;
+
+        // Check if a selection exists and if it's the collection provided.
+        // If they're not the same collection, bail; we're in another
+        // selection's event loop.
+        if ( ! selection || ( collection && collection !== selection ) ) {
+            return;
+        }
+
+        // Bail if the model is already selected.
+        if ( this.$el.hasClass( 'selected' ) ) {
+            return;
+        }
+
+        // Add 'selected' class to model, set aria-checked to true.
+        this.$el.addClass( 'selected' ).attr( 'aria-checked', true );
+        //  Make the checkbox tabable, except in media grid (bulk select mode).
+        if ( ! ( controller.isModeActive( 'grid' ) && controller.isModeActive( 'select' ) ) ) {
+            this.$( '.check' ).attr( 'tabindex', '0' );
+        }
+    },
+    /**
+     * @param {Backbone.Model} model
+     * @param {Backbone.Collection} collection
+     */
+    deselect: function( model, collection ) {
+        var selection = this.options.selection;
+
+        // Check if a selection exists and if it's the collection provided.
+        // If they're not the same collection, bail; we're in another
+        // selection's event loop.
+        if ( ! selection || ( collection && collection !== selection ) ) {
+            return;
+        }
+        this.$el.removeClass( 'selected' ).attr( 'aria-checked', false )
+            .find( '.check' ).attr( 'tabindex', '-1' );
+    },
+    /**
+     * @param {Backbone.Model} model
+     * @param {Backbone.Collection} collection
+     */
+    details: function( model, collection ) {
+        var selection = this.options.selection,
+            details;
+
+        if ( selection !== collection ) {
+            return;
+        }
+
+        details = selection.single();
+        this.$el.toggleClass( 'details', details === this.model );
+    },
+    /**
+     * @param {string} size
+     * @returns {Object}
+     */
+    imageSize: function( size ) {
+        var sizes = this.model.get('sizes'), matched = false;
+
+        size = size || 'medium';
+
+        // Use the provided image size if possible.
+        if ( sizes ) {
+            if ( sizes[ size ] ) {
+                matched = sizes[ size ];
+            } else if ( sizes.large ) {
+                matched = sizes.large;
+            } else if ( sizes.thumbnail ) {
+                matched = sizes.thumbnail;
+            } else if ( sizes.full ) {
+                matched = sizes.full;
+            }
+
+            if ( matched ) {
+                return _.clone( matched );
+            }
+        }
+
+        return {
+            url:         this.model.get('url'),
+            width:       this.model.get('width'),
+            height:      this.model.get('height'),
+            orientation: this.model.get('orientation')
+        };
+    },
+    /**
+     * @param {Object} event
+     */
+    updateSetting: function( event ) {
+        var $setting = $( event.target ).closest('[data-setting]'),
+            setting, value;
+
+        if ( ! $setting.length ) {
+            return;
+        }
+
+        setting = $setting.data('setting');
+        value   = event.target.value;
+
+        if ( this.model.get( setting ) !== value ) {
+            this.save( setting, value );
+        }
+    },
+
+    /**
+     * Pass all the arguments to the model's save method.
+     *
+     * Records the aggregate status of all save requests and updates the
+     * view's classes accordingly.
+     */
+    save: function() {
+        var view = this,
+            save = this._save = this._save || { status: 'ready' },
+            request = this.model.save.apply( this.model, arguments ),
+            requests = save.requests ? $.when( request, save.requests ) : request;
+
+        // If we're waiting to remove 'Saved.', stop.
+        if ( save.savedTimer ) {
+            clearTimeout( save.savedTimer );
+        }
+
+        this.updateSave('waiting');
+        save.requests = requests;
+        requests.always( function() {
+            // If we've performed another request since this one, bail.
+            if ( save.requests !== requests ) {
+                return;
+            }
+
+            view.updateSave( requests.state() === 'resolved' ? 'complete' : 'error' );
+            save.savedTimer = setTimeout( function() {
+                view.updateSave('ready');
+                delete save.savedTimer;
+            }, 2000 );
+        });
+    },
+    /**
+     * @param {string} status
+     * @returns {wp.media.view.Attachment} Returns itself to allow chaining
+     */
+    updateSave: function( status ) {
+        var save = this._save = this._save || { status: 'ready' };
+
+        if ( status && status !== save.status ) {
+            this.$el.removeClass( 'save-' + save.status );
+            save.status = status;
+        }
+
+        this.$el.addClass( 'save-' + save.status );
+        return this;
+    },
+
+    updateAll: function() {
+        var $settings = this.$('[data-setting]'),
+            model = this.model,
+            changed;
+
+        changed = _.chain( $settings ).map( function( el ) {
+            var $input = $('input, textarea, select, [value]', el ),
+                setting, value;
+
+            if ( ! $input.length ) {
+                return;
+            }
+
+            setting = $(el).data('setting');
+            value = $input.val();
+
+            // Record the value if it changed.
+            if ( model.get( setting ) !== value ) {
+                return [ setting, value ];
+            }
+        }).compact().object().value();
+
+        if ( ! _.isEmpty( changed ) ) {
+            model.save( changed );
+        }
+    },
+    /**
+     * @param {Object} event
+     */
+    removeFromLibrary: function( event ) {
+        // Catch enter and space events
+        if ( 'keydown' === event.type && 13 !== event.keyCode && 32 !== event.keyCode ) {
+            return;
+        }
+
+        // Stop propagation so the model isn't selected.
+        event.stopPropagation();
+
+        this.collection.remove( this.model );
+    },
+
+    /**
+     * Add the model if it isn't in the selection, if it is in the selection,
+     * remove it.
+     *
+     * @param  {[type]} event [description]
+     * @return {[type]}       [description]
+     */
+    checkClickHandler: function ( event ) {
+        var selection = this.options.selection;
+        if ( ! selection ) {
+            return;
+        }
+        event.stopPropagation();
+        if ( selection.where( { id: this.model.get( 'id' ) } ).length ) {
+            selection.remove( this.model );
+            // Move focus back to the attachment tile (from the check).
+            this.$el.focus();
+        } else {
+            selection.add( this.model );
+        }
+    }
+});
+
+// Ensure settings remain in sync between attachment views.
+_.each({
+    caption: '_syncCaption',
+    title:   '_syncTitle',
+    artist:  '_syncArtist',
+    album:   '_syncAlbum'
+}, function( method, setting ) {
+    /**
+     * @param {Backbone.Model} model
+     * @param {string} value
+     * @returns {wp.media.view.Attachment} Returns itself to allow chaining
+     */
+    Attachment.prototype[ method ] = function( model, value ) {
+        var $setting = this.$('[data-setting="' + setting + '"]');
+
+        if ( ! $setting.length ) {
+            return this;
+        }
+
+        // If the updated value is in sync with the value in the DOM, there
+        // is no need to re-render. If we're currently editing the value,
+        // it will automatically be in sync, suppressing the re-render for
+        // the view we're editing, while updating any others.
+        if ( value === $setting.find('input, textarea, select, [value]').val() ) {
+            return this;
+        }
+
+        return this.render();
+    };
+});
+
+module.exports = Attachment;
+
+
+/***/ }),
+/* 70 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.Attachment.Library
+ *
+ * @class
+ * @augments wp.media.view.Attachment
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Library = wp.media.view.Attachment.extend({
+    buttons: {
+        check: true
+    }
+});
+
+module.exports = Library;
+
+
+/***/ }),
+/* 71 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.Attachment.EditLibrary
+ *
+ * @class
+ * @augments wp.media.view.Attachment
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var EditLibrary = wp.media.view.Attachment.extend({
+    buttons: {
+        close: true
+    }
+});
+
+module.exports = EditLibrary;
+
+
+/***/ }),
+/* 72 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.Attachments
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var View = wp.media.View,
+    $ = jQuery,
+    Attachments;
+
+Attachments = View.extend({
+    tagName:   'ul',
+    className: 'attachments',
+
+    attributes: {
+        tabIndex: -1
+    },
+
+    initialize: function() {
+        this.el.id = _.uniqueId('__attachments-view-');
+
+        _.defaults( this.options, {
+            refreshSensitivity: wp.media.isTouchDevice ? 300 : 200,
+            refreshThreshold:   3,
+            AttachmentView:     wp.media.view.Attachment,
+            sortable:           false,
+            resize:             true,
+            idealColumnWidth:   $( window ).width() < 640 ? 135 : 150
+        });
+
+        this._viewsByCid = {};
+        this.$window = $( window );
+        this.resizeEvent = 'resize.media-modal-columns';
+
+        this.collection.on( 'add', function( attachment ) {
+            this.views.add( this.createAttachmentView( attachment ), {
+                at: this.collection.indexOf( attachment )
+            });
+        }, this );
+
+        this.collection.on( 'remove', function( attachment ) {
+            var view = this._viewsByCid[ attachment.cid ];
+            delete this._viewsByCid[ attachment.cid ];
+
+            if ( view ) {
+                view.remove();
+            }
+        }, this );
+
+        this.collection.on( 'reset', this.render, this );
+
+        this.listenTo( this.controller, 'library:selection:add',    this.attachmentFocus );
+
+        // Throttle the scroll handler and bind this.
+        this.scroll = _.chain( this.scroll ).bind( this ).throttle( this.options.refreshSensitivity ).value();
+
+        this.options.scrollElement = this.options.scrollElement || this.el;
+        $( this.options.scrollElement ).on( 'scroll', this.scroll );
+
+        this.initSortable();
+
+        _.bindAll( this, 'setColumns' );
+
+        if ( this.options.resize ) {
+            this.on( 'ready', this.bindEvents );
+            this.controller.on( 'open', this.setColumns );
+
+            // Call this.setColumns() after this view has been rendered in the DOM so
+            // attachments get proper width applied.
+            _.defer( this.setColumns, this );
+        }
+    },
+
+    bindEvents: function() {
+        this.$window.off( this.resizeEvent ).on( this.resizeEvent, _.debounce( this.setColumns, 50 ) );
+    },
+
+    attachmentFocus: function() {
+        this.$( 'li:first' ).focus();
+    },
+
+    restoreFocus: function() {
+        this.$( 'li.selected:first' ).focus();
+    },
+
+    arrowEvent: function( event ) {
+        var attachments = this.$el.children( 'li' ),
+            perRow = this.columns,
+            index = attachments.filter( ':focus' ).index(),
+            row = ( index + 1 ) <= perRow ? 1 : Math.ceil( ( index + 1 ) / perRow );
+
+        if ( index === -1 ) {
+            return;
+        }
+
+        // Left arrow
+        if ( 37 === event.keyCode ) {
+            if ( 0 === index ) {
+                return;
+            }
+            attachments.eq( index - 1 ).focus();
+        }
+
+        // Up arrow
+        if ( 38 === event.keyCode ) {
+            if ( 1 === row ) {
+                return;
+            }
+            attachments.eq( index - perRow ).focus();
+        }
+
+        // Right arrow
+        if ( 39 === event.keyCode ) {
+            if ( attachments.length === index ) {
+                return;
+            }
+            attachments.eq( index + 1 ).focus();
+        }
+
+        // Down arrow
+        if ( 40 === event.keyCode ) {
+            if ( Math.ceil( attachments.length / perRow ) === row ) {
+                return;
+            }
+            attachments.eq( index + perRow ).focus();
+        }
+    },
+
+    dispose: function() {
+        this.collection.props.off( null, null, this );
+        if ( this.options.resize ) {
+            this.$window.off( this.resizeEvent );
+        }
+
+        /**
+         * call 'dispose' directly on the parent class
+         */
+        View.prototype.dispose.apply( this, arguments );
+    },
+
+    setColumns: function() {
+        var prev = this.columns,
+            width = this.$el.width();
+
+        if ( width ) {
+            this.columns = Math.min( Math.round( width / this.options.idealColumnWidth ), 12 ) || 1;
+
+            if ( ! prev || prev !== this.columns ) {
+                this.$el.closest( '.media-frame-content' ).attr( 'data-columns', this.columns );
+            }
+        }
+    },
+
+    initSortable: function() {
+        var collection = this.collection;
+
+        if ( wp.media.isTouchDevice || ! this.options.sortable || ! $.fn.sortable ) {
+            return;
+        }
+
+        this.$el.sortable( _.extend({
+            // If the `collection` has a `comparator`, disable sorting.
+            disabled: !! collection.comparator,
+
+            // Change the position of the attachment as soon as the
+            // mouse pointer overlaps a thumbnail.
+            tolerance: 'pointer',
+
+            // Record the initial `index` of the dragged model.
+            start: function( event, ui ) {
+                ui.item.data('sortableIndexStart', ui.item.index());
+            },
+
+            // Update the model's index in the collection.
+            // Do so silently, as the view is already accurate.
+            update: function( event, ui ) {
+                var model = collection.at( ui.item.data('sortableIndexStart') ),
+                    comparator = collection.comparator;
+
+                // Temporarily disable the comparator to prevent `add`
+                // from re-sorting.
+                delete collection.comparator;
+
+                // Silently shift the model to its new index.
+                collection.remove( model, {
+                    silent: true
+                });
+                collection.add( model, {
+                    silent: true,
+                    at:     ui.item.index()
+                });
+
+                // Restore the comparator.
+                collection.comparator = comparator;
+
+                // Fire the `reset` event to ensure other collections sync.
+                collection.trigger( 'reset', collection );
+
+                // If the collection is sorted by menu order,
+                // update the menu order.
+                collection.saveMenuOrder();
+            }
+        }, this.options.sortable ) );
+
+        // If the `orderby` property is changed on the `collection`,
+        // check to see if we have a `comparator`. If so, disable sorting.
+        collection.props.on( 'change:orderby', function() {
+            this.$el.sortable( 'option', 'disabled', !! collection.comparator );
+        }, this );
+
+        this.collection.props.on( 'change:orderby', this.refreshSortable, this );
+        this.refreshSortable();
+    },
+
+    refreshSortable: function() {
+        if ( wp.media.isTouchDevice || ! this.options.sortable || ! $.fn.sortable ) {
+            return;
+        }
+
+        // If the `collection` has a `comparator`, disable sorting.
+        var collection = this.collection,
+            orderby = collection.props.get('orderby'),
+            enabled = 'menuOrder' === orderby || ! collection.comparator;
+
+        this.$el.sortable( 'option', 'disabled', ! enabled );
+    },
+
+    /**
+     * @param {wp.media.model.Attachment} attachment
+     * @returns {wp.media.View}
+     */
+    createAttachmentView: function( attachment ) {
+        var view = new this.options.AttachmentView({
+            controller:           this.controller,
+            model:                attachment,
+            collection:           this.collection,
+            selection:            this.options.selection
+        });
+
+        return this._viewsByCid[ attachment.cid ] = view;
+    },
+
+    prepare: function() {
+        // Create all of the Attachment views, and replace
+        // the list in a single DOM operation.
+        if ( this.collection.length ) {
+            this.views.set( this.collection.map( this.createAttachmentView, this ) );
+
+        // If there are no elements, clear the views and load some.
+        } else {
+            this.views.unset();
+            this.collection.more().done( this.scroll );
+        }
+    },
+
+    ready: function() {
+        // Trigger the scroll event to check if we're within the
+        // threshold to query for additional attachments.
+        this.scroll();
+    },
+
+    scroll: function() {
+        var view = this,
+            el = this.options.scrollElement,
+            scrollTop = el.scrollTop,
+            toolbar;
+
+        // The scroll event occurs on the document, but the element
+        // that should be checked is the document body.
+        if ( el === document ) {
+            el = document.body;
+            scrollTop = $(document).scrollTop();
+        }
+
+        if ( ! $(el).is(':visible') || ! this.collection.hasMore() ) {
+            return;
+        }
+
+        toolbar = this.views.parent.toolbar;
+
+        // Show the spinner only if we are close to the bottom.
+        if ( el.scrollHeight - ( scrollTop + el.clientHeight ) < el.clientHeight / 3 ) {
+            toolbar.get('spinner').show();
+        }
+
+        if ( el.scrollHeight < scrollTop + ( el.clientHeight * this.options.refreshThreshold ) ) {
+            this.collection.more().done(function() {
+                view.scroll();
+                toolbar.get('spinner').hide();
+            });
+        }
+    }
+});
+
+module.exports = Attachments;
+
+
+/***/ }),
+/* 73 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.Search
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var l10n = wp.media.view.l10n,
+    Search;
+
+Search = wp.media.View.extend({
+    tagName:   'input',
+    className: 'search',
+    id:        'media-search-input',
+
+    attributes: {
+        type:        'search',
+        placeholder: l10n.search
+    },
+
+    events: {
+        'input':  'search',
+        'keyup':  'search',
+        'change': 'search',
+        'search': 'search'
+    },
+
+    /**
+     * @returns {wp.media.view.Search} Returns itself to allow chaining
+     */
+    render: function() {
+        this.el.value = this.model.escape('search');
+        return this;
+    },
+
+    search: function( event ) {
+        if ( event.target.value ) {
+            this.model.set( 'search', event.target.value );
+        } else {
+            this.model.unset('search');
+        }
+    }
+});
+
+module.exports = Search;
+
+
+/***/ }),
+/* 74 */
+/***/ (function(module, exports) {
+
 /**
  * wp.media.view.AttachmentFilters
@@ -2443 +6747 @@
 module.exports = AttachmentFilters;
 
-},{}],22:[function(require,module,exports){
-/**
- * wp.media.view.AttachmentFilters.All
- *
- * @class
- * @augments wp.media.view.AttachmentFilters
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var l10n = wp.media.view.l10n,
-    All;
-
-All = wp.media.view.AttachmentFilters.extend({
-    createFilters: function() {
-        var filters = {};
-
-        _.each( wp.media.view.settings.mimeTypes || {}, function( text, key ) {
-            filters[ key ] = {
-                text: text,
-                props: {
-                    status:  null,
-                    type:    key,
-                    uploadedTo: null,
-                    orderby: 'date',
-                    order:   'DESC'
-                }
-            };
-        });
-
-        filters.all = {
-            text:  l10n.allMediaItems,
-            props: {
-                status:  null,
-                type:    null,
-                uploadedTo: null,
-                orderby: 'date',
-                order:   'DESC'
-            },
-            priority: 10
-        };
-
-        if ( wp.media.view.settings.post.id ) {
-            filters.uploaded = {
-                text:  l10n.uploadedToThisPost,
-                props: {
-                    status:  null,
-                    type:    null,
-                    uploadedTo: wp.media.view.settings.post.id,
-                    orderby: 'menuOrder',
-                    order:   'ASC'
-                },
-                priority: 20
-            };
-        }
-
-        filters.unattached = {
-            text:  l10n.unattached,
-            props: {
-                status:     null,
-                uploadedTo: 0,
-                type:       null,
-                orderby:    'menuOrder',
-                order:      'ASC'
-            },
-            priority: 50
-        };
-
-        if ( wp.media.view.settings.mediaTrash &&
-            this.controller.isModeActive( 'grid' ) ) {
-
-            filters.trash = {
-                text:  l10n.trash,
-                props: {
-                    uploadedTo: null,
-                    status:     'trash',
-                    type:       null,
-                    orderby:    'date',
-                    order:      'DESC'
-                },
-                priority: 50
-            };
-        }
-
-        this.filters = filters;
-    }
-});
-
-module.exports = All;
-
-},{}],23:[function(require,module,exports){
+
+/***/ }),
+/* 75 */
+/***/ (function(module, exports) {
+
 /**
  * A filter dropdown for month/dates.
@@ -2574 +6792 @@
 module.exports = DateFilter;
 
-},{}],24:[function(require,module,exports){
+
+/***/ }),
+/* 76 */
+/***/ (function(module, exports) {
+
 /**
  * wp.media.view.AttachmentFilters.Uploaded
@@ -2633 +6855 @@
 module.exports = Uploaded;
 
-},{}],25:[function(require,module,exports){
+
+/***/ }),
+/* 77 */
+/***/ (function(module, exports) {
+
 /**
- * wp.media.view.Attachment
+ * wp.media.view.AttachmentFilters.All
  *
  * @class
+ * @augments wp.media.view.AttachmentFilters
  * @augments wp.media.View
  * @augments wp.Backbone.View
  * @augments Backbone.View
  */
-var View = wp.media.View,
-    $ = jQuery,
-    Attachment;
-
-Attachment = View.extend({
-    tagName:   'li',
-    className: 'attachment',
-    template:  wp.template('attachment'),
-
-    attributes: function() {
-        return {
-            'tabIndex':     0,
-            'role':         'checkbox',
-            'aria-label':   this.model.get( 'title' ),
-            'aria-checked': false,
-            'data-id':      this.model.get( 'id' )
+var l10n = wp.media.view.l10n,
+    All;
+
+All = wp.media.view.AttachmentFilters.extend({
+    createFilters: function() {
+        var filters = {};
+
+        _.each( wp.media.view.settings.mimeTypes || {}, function( text, key ) {
+            filters[ key ] = {
+                text: text,
+                props: {
+                    status:  null,
+                    type:    key,
+                    uploadedTo: null,
+                    orderby: 'date',
+                    order:   'DESC'
+                }
+            };
+        });
+
+        filters.all = {
+            text:  l10n.allMediaItems,
+            props: {
+                status:  null,
+                type:    null,
+                uploadedTo: null,
+                orderby: 'date',
+                order:   'DESC'
+            },
+            priority: 10
         };
-    },
-
-    events: {
-        'click .js--select-attachment':   'toggleSelectionHandler',
-        'change [data-setting]':          'updateSetting',
-        'change [data-setting] input':    'updateSetting',
-        'change [data-setting] select':   'updateSetting',
-        'change [data-setting] textarea': 'updateSetting',
-        'click .attachment-close':        'removeFromLibrary',
-        'click .check':                   'checkClickHandler',
-        'keydown':                        'toggleSelectionHandler'
-    },
-
-    buttons: {},
-
-    initialize: function() {
-        var selection = this.options.selection,
-            options = _.defaults( this.options, {
-                rerenderOnModelChange: true
-            } );
-
-        if ( options.rerenderOnModelChange ) {
-            this.listenTo( this.model, 'change', this.render );
-        } else {
-            this.listenTo( this.model, 'change:percent', this.progress );
-        }
-        this.listenTo( this.model, 'change:title', this._syncTitle );
-        this.listenTo( this.model, 'change:caption', this._syncCaption );
-        this.listenTo( this.model, 'change:artist', this._syncArtist );
-        this.listenTo( this.model, 'change:album', this._syncAlbum );
-
-        // Update the selection.
-        this.listenTo( this.model, 'add', this.select );
-        this.listenTo( this.model, 'remove', this.deselect );
-        if ( selection ) {
-            selection.on( 'reset', this.updateSelect, this );
-            // Update the model's details view.
-            this.listenTo( this.model, 'selection:single selection:unsingle', this.details );
-            this.details( this.model, this.controller.state().get('selection') );
-        }
-
-        this.listenTo( this.controller, 'attachment:compat:waiting attachment:compat:ready', this.updateSave );
-    },
-    /**
-     * @returns {wp.media.view.Attachment} Returns itself to allow chaining
-     */
-    dispose: function() {
-        var selection = this.options.selection;
-
-        // Make sure all settings are saved before removing the view.
-        this.updateAll();
-
-        if ( selection ) {
-            selection.off( null, null, this );
-        }
-        /**
-         * call 'dispose' directly on the parent class
-         */
-        View.prototype.dispose.apply( this, arguments );
-        return this;
-    },
-    /**
-     * @returns {wp.media.view.Attachment} Returns itself to allow chaining
-     */
-    render: function() {
-        var options = _.defaults( this.model.toJSON(), {
-                orientation:   'landscape',
-                uploading:     false,
-                type:          '',
-                subtype:       '',
-                icon:          '',
-                filename:      '',
-                caption:       '',
-                title:         '',
-                dateFormatted: '',
-                width:         '',
-                height:        '',
-                compat:        false,
-                alt:           '',
-                description:   ''
-            }, this.options );
-
-        options.buttons  = this.buttons;
-        options.describe = this.controller.state().get('describe');
-
-        if ( 'image' === options.type ) {
-            options.size = this.imageSize();
-        }
-
-        options.can = {};
-        if ( options.nonces ) {
-            options.can.remove = !! options.nonces['delete'];
-            options.can.save = !! options.nonces.update;
-        }
-
-        if ( this.controller.state().get('allowLocalEdits') ) {
-            options.allowLocalEdits = true;
-        }
-
-        if ( options.uploading && ! options.percent ) {
-            options.percent = 0;
-        }
-
-        this.views.detach();
-        this.$el.html( this.template( options ) );
-
-        this.$el.toggleClass( 'uploading', options.uploading );
-
-        if ( options.uploading ) {
-            this.$bar = this.$('.media-progress-bar div');
-        } else {
-            delete this.$bar;
-        }
-
-        // Check if the model is selected.
-        this.updateSelect();
-
-        // Update the save status.
-        this.updateSave();
-
-        this.views.render();
-
-        return this;
-    },
-
-    progress: function() {
-        if ( this.$bar && this.$bar.length ) {
-            this.$bar.width( this.model.get('percent') + '%' );
-        }
-    },
-
-    /**
-     * @param {Object} event
-     */
-    toggleSelectionHandler: function( event ) {
-        var method;
-
-        // Don't do anything inside inputs and on the attachment check and remove buttons.
-        if ( 'INPUT' === event.target.nodeName || 'BUTTON' === event.target.nodeName ) {
-            return;
-        }
-
-        // Catch arrow events
-        if ( 37 === event.keyCode || 38 === event.keyCode || 39 === event.keyCode || 40 === event.keyCode ) {
-            this.controller.trigger( 'attachment:keydown:arrow', event );
-            return;
-        }
-
-        // Catch enter and space events
-        if ( 'keydown' === event.type && 13 !== event.keyCode && 32 !== event.keyCode ) {
-            return;
-        }
-
-        event.preventDefault();
-
-        // In the grid view, bubble up an edit:attachment event to the controller.
-        if ( this.controller.isModeActive( 'grid' ) ) {
-            if ( this.controller.isModeActive( 'edit' ) ) {
-                // Pass the current target to restore focus when closing
-                this.controller.trigger( 'edit:attachment', this.model, event.currentTarget );
-                return;
-            }
-
-            if ( this.controller.isModeActive( 'select' ) ) {
-                method = 'toggle';
-            }
-        }
-
-        if ( event.shiftKey ) {
-            method = 'between';
-        } else if ( event.ctrlKey || event.metaKey ) {
-            method = 'toggle';
-        }
-
-        this.toggleSelection({
-            method: method
-        });
-
-        this.controller.trigger( 'selection:toggle' );
-    },
-    /**
-     * @param {Object} options
-     */
-    toggleSelection: function( options ) {
-        var collection = this.collection,
-            selection = this.options.selection,
-            model = this.model,
-            method = options && options.method,
-            single, models, singleIndex, modelIndex;
-
-        if ( ! selection ) {
-            return;
-        }
-
-        single = selection.single();
-        method = _.isUndefined( method ) ? selection.multiple : method;
-
-        // If the `method` is set to `between`, select all models that
-        // exist between the current and the selected model.
-        if ( 'between' === method && single && selection.multiple ) {
-            // If the models are the same, short-circuit.
-            if ( single === model ) {
-                return;
-            }
-
-            singleIndex = collection.indexOf( single );
-            modelIndex  = collection.indexOf( this.model );
-
-            if ( singleIndex < modelIndex ) {
-                models = collection.models.slice( singleIndex, modelIndex + 1 );
-            } else {
-                models = collection.models.slice( modelIndex, singleIndex + 1 );
-            }
-
-            selection.add( models );
-            selection.single( model );
-            return;
-
-        // If the `method` is set to `toggle`, just flip the selection
-        // status, regardless of whether the model is the single model.
-        } else if ( 'toggle' === method ) {
-            selection[ this.selected() ? 'remove' : 'add' ]( model );
-            selection.single( model );
-            return;
-        } else if ( 'add' === method ) {
-            selection.add( model );
-            selection.single( model );
-            return;
-        }
-
-        // Fixes bug that loses focus when selecting a featured image
-        if ( ! method ) {
-            method = 'add';
-        }
-
-        if ( method !== 'add' ) {
-            method = 'reset';
-        }
-
-        if ( this.selected() ) {
-            // If the model is the single model, remove it.
-            // If it is not the same as the single model,
-            // it now becomes the single model.
-            selection[ single === model ? 'remove' : 'single' ]( model );
-        } else {
-            // If the model is not selected, run the `method` on the
-            // selection. By default, we `reset` the selection, but the
-            // `method` can be set to `add` the model to the selection.
-            selection[ method ]( model );
-            selection.single( model );
-        }
-    },
-
-    updateSelect: function() {
-        this[ this.selected() ? 'select' : 'deselect' ]();
-    },
-    /**
-     * @returns {unresolved|Boolean}
-     */
-    selected: function() {
-        var selection = this.options.selection;
-        if ( selection ) {
-            return !! selection.get( this.model.cid );
-        }
-    },
-    /**
-     * @param {Backbone.Model} model
-     * @param {Backbone.Collection} collection
-     */
-    select: function( model, collection ) {
-        var selection = this.options.selection,
-            controller = this.controller;
-
-        // Check if a selection exists and if it's the collection provided.
-        // If they're not the same collection, bail; we're in another
-        // selection's event loop.
-        if ( ! selection || ( collection && collection !== selection ) ) {
-            return;
-        }
-
-        // Bail if the model is already selected.
-        if ( this.$el.hasClass( 'selected' ) ) {
-            return;
-        }
-
-        // Add 'selected' class to model, set aria-checked to true.
-        this.$el.addClass( 'selected' ).attr( 'aria-checked', true );
-        //  Make the checkbox tabable, except in media grid (bulk select mode).
-        if ( ! ( controller.isModeActive( 'grid' ) && controller.isModeActive( 'select' ) ) ) {
-            this.$( '.check' ).attr( 'tabindex', '0' );
-        }
-    },
-    /**
-     * @param {Backbone.Model} model
-     * @param {Backbone.Collection} collection
-     */
-    deselect: function( model, collection ) {
-        var selection = this.options.selection;
-
-        // Check if a selection exists and if it's the collection provided.
-        // If they're not the same collection, bail; we're in another
-        // selection's event loop.
-        if ( ! selection || ( collection && collection !== selection ) ) {
-            return;
-        }
-        this.$el.removeClass( 'selected' ).attr( 'aria-checked', false )
-            .find( '.check' ).attr( 'tabindex', '-1' );
-    },
-    /**
-     * @param {Backbone.Model} model
-     * @param {Backbone.Collection} collection
-     */
-    details: function( model, collection ) {
-        var selection = this.options.selection,
-            details;
-
-        if ( selection !== collection ) {
-            return;
-        }
-
-        details = selection.single();
-        this.$el.toggleClass( 'details', details === this.model );
-    },
-    /**
-     * @param {string} size
-     * @returns {Object}
-     */
-    imageSize: function( size ) {
-        var sizes = this.model.get('sizes'), matched = false;
-
-        size = size || 'medium';
-
-        // Use the provided image size if possible.
-        if ( sizes ) {
-            if ( sizes[ size ] ) {
-                matched = sizes[ size ];
-            } else if ( sizes.large ) {
-                matched = sizes.large;
-            } else if ( sizes.thumbnail ) {
-                matched = sizes.thumbnail;
-            } else if ( sizes.full ) {
-                matched = sizes.full;
-            }
-
-            if ( matched ) {
-                return _.clone( matched );
-            }
-        }
-
-        return {
-            url:         this.model.get('url'),
-            width:       this.model.get('width'),
-            height:      this.model.get('height'),
-            orientation: this.model.get('orientation')
+
+        if ( wp.media.view.settings.post.id ) {
+            filters.uploaded = {
+                text:  l10n.uploadedToThisPost,
+                props: {
+                    status:  null,
+                    type:    null,
+                    uploadedTo: wp.media.view.settings.post.id,
+                    orderby: 'menuOrder',
+                    order:   'ASC'
+                },
+                priority: 20
+            };
+        }
+
+        filters.unattached = {
+            text:  l10n.unattached,
+            props: {
+                status:     null,
+                uploadedTo: 0,
+                type:       null,
+                orderby:    'menuOrder',
+                order:      'ASC'
+            },
+            priority: 50
         };
-    },
-    /**
-     * @param {Object} event
-     */
-    updateSetting: function( event ) {
-        var $setting = $( event.target ).closest('[data-setting]'),
-            setting, value;
-
-        if ( ! $setting.length ) {
-            return;
-        }
-
-        setting = $setting.data('setting');
-        value   = event.target.value;
-
-        if ( this.model.get( setting ) !== value ) {
-            this.save( setting, value );
-        }
-    },
-
-    /**
-     * Pass all the arguments to the model's save method.
-     *
-     * Records the aggregate status of all save requests and updates the
-     * view's classes accordingly.
-     */
-    save: function() {
-        var view = this,
-            save = this._save = this._save || { status: 'ready' },
-            request = this.model.save.apply( this.model, arguments ),
-            requests = save.requests ? $.when( request, save.requests ) : request;
-
-        // If we're waiting to remove 'Saved.', stop.
-        if ( save.savedTimer ) {
-            clearTimeout( save.savedTimer );
-        }
-
-        this.updateSave('waiting');
-        save.requests = requests;
-        requests.always( function() {
-            // If we've performed another request since this one, bail.
-            if ( save.requests !== requests ) {
-                return;
-            }
-
-            view.updateSave( requests.state() === 'resolved' ? 'complete' : 'error' );
-            save.savedTimer = setTimeout( function() {
-                view.updateSave('ready');
-                delete save.savedTimer;
-            }, 2000 );
-        });
-    },
-    /**
-     * @param {string} status
-     * @returns {wp.media.view.Attachment} Returns itself to allow chaining
-     */
-    updateSave: function( status ) {
-        var save = this._save = this._save || { status: 'ready' };
-
-        if ( status && status !== save.status ) {
-            this.$el.removeClass( 'save-' + save.status );
-            save.status = status;
-        }
-
-        this.$el.addClass( 'save-' + save.status );
-        return this;
-    },
-
-    updateAll: function() {
-        var $settings = this.$('[data-setting]'),
-            model = this.model,
-            changed;
-
-        changed = _.chain( $settings ).map( function( el ) {
-            var $input = $('input, textarea, select, [value]', el ),
-                setting, value;
-
-            if ( ! $input.length ) {
-                return;
-            }
-
-            setting = $(el).data('setting');
-            value = $input.val();
-
-            // Record the value if it changed.
-            if ( model.get( setting ) !== value ) {
-                return [ setting, value ];
-            }
-        }).compact().object().value();
-
-        if ( ! _.isEmpty( changed ) ) {
-            model.save( changed );
-        }
-    },
-    /**
-     * @param {Object} event
-     */
-    removeFromLibrary: function( event ) {
-        // Catch enter and space events
-        if ( 'keydown' === event.type && 13 !== event.keyCode && 32 !== event.keyCode ) {
-            return;
-        }
-
-        // Stop propagation so the model isn't selected.
-        event.stopPropagation();
-
-        this.collection.remove( this.model );
-    },
-
-    /**
-     * Add the model if it isn't in the selection, if it is in the selection,
-     * remove it.
-     *
-     * @param  {[type]} event [description]
-     * @return {[type]}       [description]
-     */
-    checkClickHandler: function ( event ) {
-        var selection = this.options.selection;
-        if ( ! selection ) {
-            return;
-        }
-        event.stopPropagation();
-        if ( selection.where( { id: this.model.get( 'id' ) } ).length ) {
-            selection.remove( this.model );
-            // Move focus back to the attachment tile (from the check).
-            this.$el.focus();
-        } else {
-            selection.add( this.model );
-        }
+
+        if ( wp.media.view.settings.mediaTrash &&
+            this.controller.isModeActive( 'grid' ) ) {
+
+            filters.trash = {
+                text:  l10n.trash,
+                props: {
+                    uploadedTo: null,
+                    status:     'trash',
+                    type:       null,
+                    orderby:    'date',
+                    order:      'DESC'
+                },
+                priority: 50
+            };
+        }
+
+        this.filters = filters;
     }
 });
 
-// Ensure settings remain in sync between attachment views.
-_.each({
-    caption: '_syncCaption',
-    title:   '_syncTitle',
-    artist:  '_syncArtist',
-    album:   '_syncAlbum'
-}, function( method, setting ) {
-    /**
-     * @param {Backbone.Model} model
-     * @param {string} value
-     * @returns {wp.media.view.Attachment} Returns itself to allow chaining
-     */
-    Attachment.prototype[ method ] = function( model, value ) {
-        var $setting = this.$('[data-setting="' + setting + '"]');
-
-        if ( ! $setting.length ) {
-            return this;
-        }
-
-        // If the updated value is in sync with the value in the DOM, there
-        // is no need to re-render. If we're currently editing the value,
-        // it will automatically be in sync, suppressing the re-render for
-        // the view we're editing, while updating any others.
-        if ( value === $setting.find('input, textarea, select, [value]').val() ) {
-            return this;
-        }
-
-        return this.render();
-    };
-});
-
-module.exports = Attachment;
-
-},{}],26:[function(require,module,exports){
-/**
- * wp.media.view.Attachment.Details
- *
- * @class
- * @augments wp.media.view.Attachment
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var Attachment = wp.media.view.Attachment,
-    l10n = wp.media.view.l10n,
-    Details;
-
-Details = Attachment.extend({
-    tagName:   'div',
-    className: 'attachment-details',
-    template:  wp.template('attachment-details'),
-
-    attributes: function() {
-        return {
-            'tabIndex':     0,
-            'data-id':      this.model.get( 'id' )
-        };
-    },
-
-    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 .untrash-attachment':      'untrashAttachment',
-        'click .edit-attachment':         'editAttachment',
-        'keydown':                        'toggleSelectionHandler'
-    },
-
-    initialize: function() {
-        this.options = _.defaults( this.options, {
-            rerenderOnModelChange: false
-        });
-
-        this.on( 'ready', this.initialFocus );
-        // Call 'initialize' directly on the parent class.
-        Attachment.prototype.initialize.apply( this, arguments );
-    },
-
-    initialFocus: function() {
-        if ( ! wp.media.isTouchDevice ) {
-            /*
-            Previously focused the first ':input' (the readonly URL text field).
-            Since the first ':input' is now a button (delete/trash): when pressing
-            spacebar on an attachment, Firefox fires deleteAttachment/trashAttachment
-            as soon as focus is moved. Explicitly target the first text field for now.
-            @todo change initial focus logic, also for accessibility.
-            */
-            this.$( 'input[type="text"]' ).eq( 0 ).focus();
-        }
-    },
-    /**
-     * @param {Object} event
-     */
-    deleteAttachment: function( event ) {
-        event.preventDefault();
-
-        if ( window.confirm( l10n.warnDelete ) ) {
-            this.model.destroy();
-            // Keep focus inside media modal
-            // after image is deleted
-            this.controller.modal.focusManager.focus();
-        }
-    },
-    /**
-     * @param {Object} event
-     */
-    trashAttachment: function( event ) {
-        var library = this.controller.library;
-        event.preventDefault();
-
-        if ( wp.media.view.settings.mediaTrash &&
-            'edit-metadata' === this.controller.content.mode() ) {
-
-            this.model.set( 'status', 'trash' );
-            this.model.save().done( function() {
-                library._requery( true );
-            } );
-        }  else {
-            this.model.destroy();
-        }
-    },
-    /**
-     * @param {Object} event
-     */
-    untrashAttachment: function( event ) {
-        var library = this.controller.library;
-        event.preventDefault();
-
-        this.model.set( 'status', 'inherit' );
-        this.model.save().done( function() {
-            library._requery( true );
-        } );
-    },
-    /**
-     * @param {Object} event
-     */
-    editAttachment: function( event ) {
-        var editState = this.controller.states.get( 'edit-image' );
-        if ( window.imageEdit && editState ) {
-            event.preventDefault();
-
-            editState.set( 'image', this.model );
-            this.controller.setState( 'edit-image' );
-        } else {
-            this.$el.addClass('needs-refresh');
-        }
-    },
-    /**
-     * 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 ) {
-        if ( 'keydown' === event.type && 9 === event.keyCode && event.shiftKey && event.target === this.$( ':tabbable' ).get( 0 ) ) {
-            this.controller.trigger( 'attachment:details:shift-tab', event );
-            return false;
-        }
-
-        if ( 37 === event.keyCode || 38 === event.keyCode || 39 === event.keyCode || 40 === event.keyCode ) {
-            this.controller.trigger( 'attachment:keydown:arrow', event );
-            return;
-        }
-    }
-});
-
-module.exports = Details;
-
-},{}],27:[function(require,module,exports){
-/**
- * wp.media.view.Attachment.EditLibrary
- *
- * @class
- * @augments wp.media.view.Attachment
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var EditLibrary = wp.media.view.Attachment.extend({
-    buttons: {
-        close: true
-    }
-});
-
-module.exports = EditLibrary;
-
-},{}],28:[function(require,module,exports){
-/**
- * wp.media.view.Attachments.EditSelection
- *
- * @class
- * @augments wp.media.view.Attachment.Selection
- * @augments wp.media.view.Attachment
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var EditSelection = wp.media.view.Attachment.Selection.extend({
-    buttons: {
-        close: true
-    }
-});
-
-module.exports = EditSelection;
-
-},{}],29:[function(require,module,exports){
-/**
- * wp.media.view.Attachment.Library
- *
- * @class
- * @augments wp.media.view.Attachment
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var Library = wp.media.view.Attachment.extend({
-    buttons: {
-        check: true
-    }
-});
-
-module.exports = Library;
-
-},{}],30:[function(require,module,exports){
-/**
- * wp.media.view.Attachment.Selection
- *
- * @class
- * @augments wp.media.view.Attachment
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var Selection = wp.media.view.Attachment.extend({
-    className: 'attachment selection',
-
-    // On click, just select the model, instead of removing the model from
-    // the selection.
-    toggleSelection: function() {
-        this.options.selection.single( this.model );
-    }
-});
-
-module.exports = Selection;
-
-},{}],31:[function(require,module,exports){
-/**
- * wp.media.view.Attachments
- *
- * @class
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var View = wp.media.View,
-    $ = jQuery,
-    Attachments;
-
-Attachments = View.extend({
-    tagName:   'ul',
-    className: 'attachments',
-
-    attributes: {
-        tabIndex: -1
-    },
-
-    initialize: function() {
-        this.el.id = _.uniqueId('__attachments-view-');
-
-        _.defaults( this.options, {
-            refreshSensitivity: wp.media.isTouchDevice ? 300 : 200,
-            refreshThreshold:   3,
-            AttachmentView:     wp.media.view.Attachment,
-            sortable:           false,
-            resize:             true,
-            idealColumnWidth:   $( window ).width() < 640 ? 135 : 150
-        });
-
-        this._viewsByCid = {};
-        this.$window = $( window );
-        this.resizeEvent = 'resize.media-modal-columns';
-
-        this.collection.on( 'add', function( attachment ) {
-            this.views.add( this.createAttachmentView( attachment ), {
-                at: this.collection.indexOf( attachment )
-            });
-        }, this );
-
-        this.collection.on( 'remove', function( attachment ) {
-            var view = this._viewsByCid[ attachment.cid ];
-            delete this._viewsByCid[ attachment.cid ];
-
-            if ( view ) {
-                view.remove();
-            }
-        }, this );
-
-        this.collection.on( 'reset', this.render, this );
-
-        this.listenTo( this.controller, 'library:selection:add',    this.attachmentFocus );
-
-        // Throttle the scroll handler and bind this.
-        this.scroll = _.chain( this.scroll ).bind( this ).throttle( this.options.refreshSensitivity ).value();
-
-        this.options.scrollElement = this.options.scrollElement || this.el;
-        $( this.options.scrollElement ).on( 'scroll', this.scroll );
-
-        this.initSortable();
-
-        _.bindAll( this, 'setColumns' );
-
-        if ( this.options.resize ) {
-            this.on( 'ready', this.bindEvents );
-            this.controller.on( 'open', this.setColumns );
-
-            // Call this.setColumns() after this view has been rendered in the DOM so
-            // attachments get proper width applied.
-            _.defer( this.setColumns, this );
-        }
-    },
-
-    bindEvents: function() {
-        this.$window.off( this.resizeEvent ).on( this.resizeEvent, _.debounce( this.setColumns, 50 ) );
-    },
-
-    attachmentFocus: function() {
-        this.$( 'li:first' ).focus();
-    },
-
-    restoreFocus: function() {
-        this.$( 'li.selected:first' ).focus();
-    },
-
-    arrowEvent: function( event ) {
-        var attachments = this.$el.children( 'li' ),
-            perRow = this.columns,
-            index = attachments.filter( ':focus' ).index(),
-            row = ( index + 1 ) <= perRow ? 1 : Math.ceil( ( index + 1 ) / perRow );
-
-        if ( index === -1 ) {
-            return;
-        }
-
-        // Left arrow
-        if ( 37 === event.keyCode ) {
-            if ( 0 === index ) {
-                return;
-            }
-            attachments.eq( index - 1 ).focus();
-        }
-
-        // Up arrow
-        if ( 38 === event.keyCode ) {
-            if ( 1 === row ) {
-                return;
-            }
-            attachments.eq( index - perRow ).focus();
-        }
-
-        // Right arrow
-        if ( 39 === event.keyCode ) {
-            if ( attachments.length === index ) {
-                return;
-            }
-            attachments.eq( index + 1 ).focus();
-        }
-
-        // Down arrow
-        if ( 40 === event.keyCode ) {
-            if ( Math.ceil( attachments.length / perRow ) === row ) {
-                return;
-            }
-            attachments.eq( index + perRow ).focus();
-        }
-    },
-
-    dispose: function() {
-        this.collection.props.off( null, null, this );
-        if ( this.options.resize ) {
-            this.$window.off( this.resizeEvent );
-        }
-
-        /**
-         * call 'dispose' directly on the parent class
-         */
-        View.prototype.dispose.apply( this, arguments );
-    },
-
-    setColumns: function() {
-        var prev = this.columns,
-            width = this.$el.width();
-
-        if ( width ) {
-            this.columns = Math.min( Math.round( width / this.options.idealColumnWidth ), 12 ) || 1;
-
-            if ( ! prev || prev !== this.columns ) {
-                this.$el.closest( '.media-frame-content' ).attr( 'data-columns', this.columns );
-            }
-        }
-    },
-
-    initSortable: function() {
-        var collection = this.collection;
-
-        if ( wp.media.isTouchDevice || ! this.options.sortable || ! $.fn.sortable ) {
-            return;
-        }
-
-        this.$el.sortable( _.extend({
-            // If the `collection` has a `comparator`, disable sorting.
-            disabled: !! collection.comparator,
-
-            // Change the position of the attachment as soon as the
-            // mouse pointer overlaps a thumbnail.
-            tolerance: 'pointer',
-
-            // Record the initial `index` of the dragged model.
-            start: function( event, ui ) {
-                ui.item.data('sortableIndexStart', ui.item.index());
-            },
-
-            // Update the model's index in the collection.
-            // Do so silently, as the view is already accurate.
-            update: function( event, ui ) {
-                var model = collection.at( ui.item.data('sortableIndexStart') ),
-                    comparator = collection.comparator;
-
-                // Temporarily disable the comparator to prevent `add`
-                // from re-sorting.
-                delete collection.comparator;
-
-                // Silently shift the model to its new index.
-                collection.remove( model, {
-                    silent: true
-                });
-                collection.add( model, {
-                    silent: true,
-                    at:     ui.item.index()
-                });
-
-                // Restore the comparator.
-                collection.comparator = comparator;
-
-                // Fire the `reset` event to ensure other collections sync.
-                collection.trigger( 'reset', collection );
-
-                // If the collection is sorted by menu order,
-                // update the menu order.
-                collection.saveMenuOrder();
-            }
-        }, this.options.sortable ) );
-
-        // If the `orderby` property is changed on the `collection`,
-        // check to see if we have a `comparator`. If so, disable sorting.
-        collection.props.on( 'change:orderby', function() {
-            this.$el.sortable( 'option', 'disabled', !! collection.comparator );
-        }, this );
-
-        this.collection.props.on( 'change:orderby', this.refreshSortable, this );
-        this.refreshSortable();
-    },
-
-    refreshSortable: function() {
-        if ( wp.media.isTouchDevice || ! this.options.sortable || ! $.fn.sortable ) {
-            return;
-        }
-
-        // If the `collection` has a `comparator`, disable sorting.
-        var collection = this.collection,
-            orderby = collection.props.get('orderby'),
-            enabled = 'menuOrder' === orderby || ! collection.comparator;
-
-        this.$el.sortable( 'option', 'disabled', ! enabled );
-    },
-
-    /**
-     * @param {wp.media.model.Attachment} attachment
-     * @returns {wp.media.View}
-     */
-    createAttachmentView: function( attachment ) {
-        var view = new this.options.AttachmentView({
-            controller:           this.controller,
-            model:                attachment,
-            collection:           this.collection,
-            selection:            this.options.selection
-        });
-
-        return this._viewsByCid[ attachment.cid ] = view;
-    },
-
-    prepare: function() {
-        // Create all of the Attachment views, and replace
-        // the list in a single DOM operation.
-        if ( this.collection.length ) {
-            this.views.set( this.collection.map( this.createAttachmentView, this ) );
-
-        // If there are no elements, clear the views and load some.
-        } else {
-            this.views.unset();
-            this.collection.more().done( this.scroll );
-        }
-    },
-
-    ready: function() {
-        // Trigger the scroll event to check if we're within the
-        // threshold to query for additional attachments.
-        this.scroll();
-    },
-
-    scroll: function() {
-        var view = this,
-            el = this.options.scrollElement,
-            scrollTop = el.scrollTop,
-            toolbar;
-
-        // The scroll event occurs on the document, but the element
-        // that should be checked is the document body.
-        if ( el === document ) {
-            el = document.body;
-            scrollTop = $(document).scrollTop();
-        }
-
-        if ( ! $(el).is(':visible') || ! this.collection.hasMore() ) {
-            return;
-        }
-
-        toolbar = this.views.parent.toolbar;
-
-        // Show the spinner only if we are close to the bottom.
-        if ( el.scrollHeight - ( scrollTop + el.clientHeight ) < el.clientHeight / 3 ) {
-            toolbar.get('spinner').show();
-        }
-
-        if ( el.scrollHeight < scrollTop + ( el.clientHeight * this.options.refreshThreshold ) ) {
-            this.collection.more().done(function() {
-                view.scroll();
-                toolbar.get('spinner').hide();
-            });
-        }
-    }
-});
-
-module.exports = Attachments;
-
-},{}],32:[function(require,module,exports){
+module.exports = All;
+
+
+/***/ }),
+/* 78 */
+/***/ (function(module, exports) {
+
 /**
  * wp.media.view.AttachmentsBrowser
@@ -4137 +7397 @@
 module.exports = AttachmentsBrowser;
 
-},{}],33:[function(require,module,exports){
+
+/***/ }),
+/* 79 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.Selection
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var l10n = wp.media.view.l10n,
+    Selection;
+
+Selection = wp.media.View.extend({
+    tagName:   'div',
+    className: 'media-selection',
+    template:  wp.template('media-selection'),
+
+    events: {
+        'click .edit-selection':  'edit',
+        'click .clear-selection': 'clear'
+    },
+
+    initialize: function() {
+        _.defaults( this.options, {
+            editable:  false,
+            clearable: true
+        });
+
+        /**
+         * @member {wp.media.view.Attachments.Selection}
+         */
+        this.attachments = new wp.media.view.Attachments.Selection({
+            controller: this.controller,
+            collection: this.collection,
+            selection:  this.collection,
+            model:      new Backbone.Model()
+        });
+
+        this.views.set( '.selection-view', this.attachments );
+        this.collection.on( 'add remove reset', this.refresh, this );
+        this.controller.on( 'content:activate', this.refresh, this );
+    },
+
+    ready: function() {
+        this.refresh();
+    },
+
+    refresh: function() {
+        // If the selection hasn't been rendered, bail.
+        if ( ! this.$el.children().length ) {
+            return;
+        }
+
+        var collection = this.collection,
+            editing = 'edit-selection' === this.controller.content.mode();
+
+        // If nothing is selected, display nothing.
+        this.$el.toggleClass( 'empty', ! collection.length );
+        this.$el.toggleClass( 'one', 1 === collection.length );
+        this.$el.toggleClass( 'editing', editing );
+
+        this.$('.count').text( l10n.selected.replace('%d', collection.length) );
+    },
+
+    edit: function( event ) {
+        event.preventDefault();
+        if ( this.options.editable ) {
+            this.options.editable.call( this, this.collection );
+        }
+    },
+
+    clear: function( event ) {
+        event.preventDefault();
+        this.collection.reset();
+
+        // Keep focus inside media modal
+        // after clear link is selected
+        this.controller.modal.focusManager.focus();
+    }
+});
+
+module.exports = Selection;
+
+
+/***/ }),
+/* 80 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.Attachment.Selection
+ *
+ * @class
+ * @augments wp.media.view.Attachment
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Selection = wp.media.view.Attachment.extend({
+    className: 'attachment selection',
+
+    // On click, just select the model, instead of removing the model from
+    // the selection.
+    toggleSelection: function() {
+        this.options.selection.single( this.model );
+    }
+});
+
+module.exports = Selection;
+
+
+/***/ }),
+/* 81 */
+/***/ (function(module, exports) {
+
 /**
  * wp.media.view.Attachments.Selection
@@ -4167 +7544 @@
 module.exports = Selection;
 
-},{}],34:[function(require,module,exports){
+
+/***/ }),
+/* 82 */
+/***/ (function(module, exports) {
+
 /**
- * wp.media.view.ButtonGroup
+ * wp.media.view.Attachments.EditSelection
  *
  * @class
+ * @augments wp.media.view.Attachment.Selection
+ * @augments wp.media.view.Attachment
  * @augments wp.media.View
  * @augments wp.Backbone.View
  * @augments Backbone.View
  */
-var $ = Backbone.$,
-    ButtonGroup;
-
-ButtonGroup = wp.media.View.extend({
-    tagName:   'div',
-    className: 'button-group button-large media-button-group',
-
-    initialize: function() {
-        /**
-         * @member {wp.media.view.Button[]}
-         */
-        this.buttons = _.map( this.options.buttons || [], function( button ) {
-            if ( button instanceof Backbone.View ) {
-                return button;
-            } else {
-                return new wp.media.view.Button( button ).render();
-            }
-        });
-
-        delete this.options.buttons;
-
-        if ( this.options.classes ) {
-            this.$el.addClass( this.options.classes );
-        }
-    },
-
-    /**
-     * @returns {wp.media.view.ButtonGroup}
-     */
-    render: function() {
-        this.$el.html( $( _.pluck( this.buttons, 'el' ) ).detach() );
-        return this;
+var EditSelection = wp.media.view.Attachment.Selection.extend({
+    buttons: {
+        close: true
     }
 });
 
-module.exports = ButtonGroup;
-
-},{}],35:[function(require,module,exports){
+module.exports = EditSelection;
+
+
+/***/ }),
+/* 83 */
+/***/ (function(module, exports) {
+
 /**
- * wp.media.view.Button
- *
- * @class
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var Button = wp.media.View.extend({
-    tagName:    'button',
-    className:  'media-button',
-    attributes: { type: 'button' },
-
-    events: {
-        'click': 'click'
-    },
-
-    defaults: {
-        text:     '',
-        style:    '',
-        size:     'large',
-        disabled: false
-    },
-
-    initialize: function() {
-        /**
-         * Create a model with the provided `defaults`.
-         *
-         * @member {Backbone.Model}
-         */
-        this.model = new Backbone.Model( this.defaults );
-
-        // If any of the `options` have a key from `defaults`, apply its
-        // value to the `model` and remove it from the `options object.
-        _.each( this.defaults, function( def, key ) {
-            var value = this.options[ key ];
-            if ( _.isUndefined( value ) ) {
-                return;
-            }
-
-            this.model.set( key, value );
-            delete this.options[ key ];
-        }, this );
-
-        this.listenTo( this.model, 'change', this.render );
-    },
-    /**
-     * @returns {wp.media.view.Button} Returns itself to allow chaining
-     */
-    render: function() {
-        var classes = [ 'button', this.className ],
-            model = this.model.toJSON();
-
-        if ( model.style ) {
-            classes.push( 'button-' + model.style );
-        }
-
-        if ( model.size ) {
-            classes.push( 'button-' + model.size );
-        }
-
-        classes = _.uniq( classes.concat( this.options.classes ) );
-        this.el.className = classes.join(' ');
-
-        this.$el.attr( 'disabled', model.disabled );
-        this.$el.text( this.model.get('text') );
-
-        return this;
-    },
-    /**
-     * @param {Object} event
-     */
-    click: function( event ) {
-        if ( '#' === this.attributes.href ) {
-            event.preventDefault();
-        }
-
-        if ( this.options.click && ! this.model.get('disabled') ) {
-            this.options.click.apply( this, arguments );
-        }
-    }
-});
-
-module.exports = Button;
-
-},{}],36:[function(require,module,exports){
-/**
- * wp.media.view.Cropper
- *
- * Uses the imgAreaSelect plugin to allow a user to crop an image.
- *
- * Takes imgAreaSelect options from
- * wp.customize.HeaderControl.calculateImageSelectOptions via
- * wp.customize.HeaderControl.openMM.
+ * wp.media.view.Settings
  *
  * @class
@@ -4315 +7581 @@
  */
 var View = wp.media.View,
-    UploaderStatus = wp.media.view.UploaderStatus,
-    l10n = wp.media.view.l10n,
-    $ = jQuery,
-    Cropper;
-
-Cropper = View.extend({
-    className: 'crop-content',
-    template: wp.template('crop-content'),
+    $ = Backbone.$,
+    Settings;
+
+Settings = View.extend({
+    events: {
+        'click button':    'updateHandler',
+        'change input':    'updateHandler',
+        'change select':   'updateHandler',
+        'change textarea': 'updateHandler'
+    },
+
     initialize: function() {
-        _.bindAll(this, 'onImageLoad');
-    },
-    ready: function() {
-        this.controller.frame.on('content:error:crop', this.onError, this);
-        this.$image = this.$el.find('.crop-image');
-        this.$image.on('load', this.onImageLoad);
-        $(window).on('resize.cropper', _.debounce(this.onImageLoad, 250));
-    },
-    remove: function() {
-        $(window).off('resize.cropper');
-        this.$el.remove();
-        this.$el.off();
-        View.prototype.remove.apply(this, arguments);
-    },
+        this.model = this.model || new Backbone.Model();
+        this.listenTo( this.model, 'change', this.updateChanges );
+    },
+
     prepare: function() {
-        return {
-            title: l10n.cropYourImage,
-            url: this.options.attachment.get('url')
-        };
-    },
-    onImageLoad: function() {
-        var imgOptions = this.controller.get('imgSelectOptions');
-        if (typeof imgOptions === 'function') {
-            imgOptions = imgOptions(this.options.attachment, this.controller);
-        }
-
-        imgOptions = _.extend(imgOptions, {parent: this.$el});
-        this.trigger('image-loaded');
-        this.controller.imgSelect = this.$image.imgAreaSelect(imgOptions);
-    },
-    onError: function() {
-        var filename = this.options.attachment.get('filename');
-
-        this.views.add( '.upload-errors', new wp.media.view.UploaderStatusError({
-            filename: UploaderStatus.prototype.filename(filename),
-            message: window._wpMediaViewsL10n.cropError
-        }), { at: 0 });
+        return _.defaults({
+            model: this.model.toJSON()
+        }, this.options );
+    },
+    /**
+     * @returns {wp.media.view.Settings} Returns itself to allow chaining
+     */
+    render: function() {
+        View.prototype.render.apply( this, arguments );
+        // Select the correct values.
+        _( this.model.attributes ).chain().keys().each( this.update, this );
+        return this;
+    },
+    /**
+     * @param {string} key
+     */
+    update: function( key ) {
+        var value = this.model.get( key ),
+            $setting = this.$('[data-setting="' + key + '"]'),
+            $buttons, $value;
+
+        // Bail if we didn't find a matching setting.
+        if ( ! $setting.length ) {
+            return;
+        }
+
+        // Attempt to determine how the setting is rendered and update
+        // the selected value.
+
+        // Handle dropdowns.
+        if ( $setting.is('select') ) {
+            $value = $setting.find('[value="' + value + '"]');
+
+            if ( $value.length ) {
+                $setting.find('option').prop( 'selected', false );
+                $value.prop( 'selected', true );
+            } else {
+                // If we can't find the desired value, record what *is* selected.
+                this.model.set( key, $setting.find(':selected').val() );
+            }
+
+        // Handle button groups.
+        } else if ( $setting.hasClass('button-group') ) {
+            $buttons = $setting.find('button').removeClass('active');
+            $buttons.filter( '[value="' + value + '"]' ).addClass('active');
+
+        // Handle text inputs and textareas.
+        } else if ( $setting.is('input[type="text"], textarea') ) {
+            if ( ! $setting.is(':focus') ) {
+                $setting.val( value );
+            }
+        // Handle checkboxes.
+        } else if ( $setting.is('input[type="checkbox"]') ) {
+            $setting.prop( 'checked', !! value && 'false' !== value );
+        }
+    },
+    /**
+     * @param {Object} event
+     */
+    updateHandler: function( event ) {
+        var $setting = $( event.target ).closest('[data-setting]'),
+            value = event.target.value,
+            userSetting;
+
+        event.preventDefault();
+
+        if ( ! $setting.length ) {
+            return;
+        }
+
+        // Use the correct value for checkboxes.
+        if ( $setting.is('input[type="checkbox"]') ) {
+            value = $setting[0].checked;
+        }
+
+        // Update the corresponding setting.
+        this.model.set( $setting.data('setting'), value );
+
+        // If the setting has a corresponding user setting,
+        // update that as well.
+        if ( userSetting = $setting.data('userSetting') ) {
+            window.setUserSetting( userSetting, value );
+        }
+    },
+
+    updateChanges: function( model ) {
+        if ( model.hasChanged() ) {
+            _( model.changed ).chain().keys().each( this.update, this );
+        }
     }
 });
 
-module.exports = Cropper;
-
-},{}],37:[function(require,module,exports){
+module.exports = Settings;
+
+
+/***/ }),
+/* 84 */
+/***/ (function(module, exports) {
+
 /**
- * wp.media.view.EditImage
+ * wp.media.view.Settings.AttachmentDisplay
+ *
+ * @class
+ * @augments wp.media.view.Settings
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Settings = wp.media.view.Settings,
+    AttachmentDisplay;
+
+AttachmentDisplay = Settings.extend({
+    className: 'attachment-display-settings',
+    template:  wp.template('attachment-display-settings'),
+
+    initialize: function() {
+        var attachment = this.options.attachment;
+
+        _.defaults( this.options, {
+            userSettings: false
+        });
+        // Call 'initialize' directly on the parent class.
+        Settings.prototype.initialize.apply( this, arguments );
+        this.listenTo( this.model, 'change:link', this.updateLinkTo );
+
+        if ( attachment ) {
+            attachment.on( 'change:uploading', this.render, this );
+        }
+    },
+
+    dispose: function() {
+        var attachment = this.options.attachment;
+        if ( attachment ) {
+            attachment.off( null, null, this );
+        }
+        /**
+         * call 'dispose' directly on the parent class
+         */
+        Settings.prototype.dispose.apply( this, arguments );
+    },
+    /**
+     * @returns {wp.media.view.AttachmentDisplay} Returns itself to allow chaining
+     */
+    render: function() {
+        var attachment = this.options.attachment;
+        if ( attachment ) {
+            _.extend( this.options, {
+                sizes: attachment.get('sizes'),
+                type:  attachment.get('type')
+            });
+        }
+        /**
+         * call 'render' directly on the parent class
+         */
+        Settings.prototype.render.call( this );
+        this.updateLinkTo();
+        return this;
+    },
+
+    updateLinkTo: function() {
+        var linkTo = this.model.get('link'),
+            $input = this.$('.link-to-custom'),
+            attachment = this.options.attachment;
+
+        if ( 'none' === linkTo || 'embed' === linkTo || ( ! attachment && 'custom' !== linkTo ) ) {
+            $input.addClass( 'hidden' );
+            return;
+        }
+
+        if ( attachment ) {
+            if ( 'post' === linkTo ) {
+                $input.val( attachment.get('link') );
+            } else if ( 'file' === linkTo ) {
+                $input.val( attachment.get('url') );
+            } else if ( ! this.model.get('linkUrl') ) {
+                $input.val('http://');
+            }
+
+            $input.prop( 'readonly', 'custom' !== linkTo );
+        }
+
+        $input.removeClass( 'hidden' );
+
+        // If the input is visible, focus and select its contents.
+        if ( ! wp.media.isTouchDevice && $input.is(':visible') ) {
+            $input.focus()[0].select();
+        }
+    }
+});
+
+module.exports = AttachmentDisplay;
+
+
+/***/ }),
+/* 85 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.Settings.Gallery
+ *
+ * @class
+ * @augments wp.media.view.Settings
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Gallery = wp.media.view.Settings.extend({
+    className: 'collection-settings gallery-settings',
+    template:  wp.template('gallery-settings')
+});
+
+module.exports = Gallery;
+
+
+/***/ }),
+/* 86 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.Settings.Playlist
+ *
+ * @class
+ * @augments wp.media.view.Settings
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Playlist = wp.media.view.Settings.extend({
+    className: 'collection-settings playlist-settings',
+    template:  wp.template('playlist-settings')
+});
+
+module.exports = Playlist;
+
+
+/***/ }),
+/* 87 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.Attachment.Details
+ *
+ * @class
+ * @augments wp.media.view.Attachment
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Attachment = wp.media.view.Attachment,
+    l10n = wp.media.view.l10n,
+    Details;
+
+Details = Attachment.extend({
+    tagName:   'div',
+    className: 'attachment-details',
+    template:  wp.template('attachment-details'),
+
+    attributes: function() {
+        return {
+            'tabIndex':     0,
+            'data-id':      this.model.get( 'id' )
+        };
+    },
+
+    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 .untrash-attachment':      'untrashAttachment',
+        'click .edit-attachment':         'editAttachment',
+        'keydown':                        'toggleSelectionHandler'
+    },
+
+    initialize: function() {
+        this.options = _.defaults( this.options, {
+            rerenderOnModelChange: false
+        });
+
+        this.on( 'ready', this.initialFocus );
+        // Call 'initialize' directly on the parent class.
+        Attachment.prototype.initialize.apply( this, arguments );
+    },
+
+    initialFocus: function() {
+        if ( ! wp.media.isTouchDevice ) {
+            /*
+            Previously focused the first ':input' (the readonly URL text field).
+            Since the first ':input' is now a button (delete/trash): when pressing
+            spacebar on an attachment, Firefox fires deleteAttachment/trashAttachment
+            as soon as focus is moved. Explicitly target the first text field for now.
+            @todo change initial focus logic, also for accessibility.
+            */
+            this.$( 'input[type="text"]' ).eq( 0 ).focus();
+        }
+    },
+    /**
+     * @param {Object} event
+     */
+    deleteAttachment: function( event ) {
+        event.preventDefault();
+
+        if ( window.confirm( l10n.warnDelete ) ) {
+            this.model.destroy();
+            // Keep focus inside media modal
+            // after image is deleted
+            this.controller.modal.focusManager.focus();
+        }
+    },
+    /**
+     * @param {Object} event
+     */
+    trashAttachment: function( event ) {
+        var library = this.controller.library;
+        event.preventDefault();
+
+        if ( wp.media.view.settings.mediaTrash &&
+            'edit-metadata' === this.controller.content.mode() ) {
+
+            this.model.set( 'status', 'trash' );
+            this.model.save().done( function() {
+                library._requery( true );
+            } );
+        }  else {
+            this.model.destroy();
+        }
+    },
+    /**
+     * @param {Object} event
+     */
+    untrashAttachment: function( event ) {
+        var library = this.controller.library;
+        event.preventDefault();
+
+        this.model.set( 'status', 'inherit' );
+        this.model.save().done( function() {
+            library._requery( true );
+        } );
+    },
+    /**
+     * @param {Object} event
+     */
+    editAttachment: function( event ) {
+        var editState = this.controller.states.get( 'edit-image' );
+        if ( window.imageEdit && editState ) {
+            event.preventDefault();
+
+            editState.set( 'image', this.model );
+            this.controller.setState( 'edit-image' );
+        } else {
+            this.$el.addClass('needs-refresh');
+        }
+    },
+    /**
+     * 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 ) {
+        if ( 'keydown' === event.type && 9 === event.keyCode && event.shiftKey && event.target === this.$( ':tabbable' ).get( 0 ) ) {
+            this.controller.trigger( 'attachment:details:shift-tab', event );
+            return false;
+        }
+
+        if ( 37 === event.keyCode || 38 === event.keyCode || 39 === event.keyCode || 40 === event.keyCode ) {
+            this.controller.trigger( 'attachment:keydown:arrow', event );
+            return;
+        }
+    }
+});
+
+module.exports = Details;
+
+
+/***/ }),
+/* 88 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.AttachmentCompat
+ *
+ * A view to display fields added via the `attachment_fields_to_edit` filter.
  *
  * @class
@@ -4376 +7990 @@
  */
 var View = wp.media.View,
-    EditImage;
-
-EditImage = View.extend({
-    className: 'image-editor',
-    template: wp.template('image-editor'),
-
-    initialize: function( options ) {
-        this.editor = window.imageEdit;
-        this.controller = options.controller;
-        View.prototype.initialize.apply( this, arguments );
-    },
-
-    prepare: function() {
-        return this.model.toJSON();
-    },
-
-    loadEditor: function() {
-        var dfd = this.editor.open( this.model.get('id'), this.model.get('nonces').edit, this );
-        dfd.done( _.bind( this.focus, this ) );
-    },
-
-    focus: function() {
-        this.$( '.imgedit-submit .button' ).eq( 0 ).focus();
-    },
-
-    back: function() {
-        var lastState = this.controller.lastState();
-        this.controller.setState( lastState );
-    },
-
-    refresh: function() {
-        this.model.fetch();
-    },
-
-    save: function() {
-        var lastState = this.controller.lastState();
-
-        this.model.fetch().done( _.bind( function() {
-            this.controller.setState( lastState );
-        }, this ) );
+    AttachmentCompat;
+
+AttachmentCompat = View.extend({
+    tagName:   'form',
+    className: 'compat-item',
+
+    events: {
+        'submit':          'preventDefault',
+        'change input':    'save',
+        'change select':   'save',
+        'change textarea': 'save'
+    },
+
+    initialize: function() {
+        this.listenTo( this.model, 'change:compat', this.render );
+    },
+    /**
+     * @returns {wp.media.view.AttachmentCompat} Returns itself to allow chaining
+     */
+    dispose: function() {
+        if ( this.$(':focus').length ) {
+            this.save();
+        }
+        /**
+         * call 'dispose' directly on the parent class
+         */
+        return View.prototype.dispose.apply( this, arguments );
+    },
+    /**
+     * @returns {wp.media.view.AttachmentCompat} Returns itself to allow chaining
+     */
+    render: function() {
+        var compat = this.model.get('compat');
+        if ( ! compat || ! compat.item ) {
+            return;
+        }
+
+        this.views.detach();
+        this.$el.html( compat.item );
+        this.views.render();
+        return this;
+    },
+    /**
+     * @param {Object} event
+     */
+    preventDefault: function( event ) {
+        event.preventDefault();
+    },
+    /**
+     * @param {Object} event
+     */
+    save: function( event ) {
+        var data = {};
+
+        if ( event ) {
+            event.preventDefault();
+        }
+
+        _.each( this.$el.serializeArray(), function( pair ) {
+            data[ pair.name ] = pair.value;
+        });
+
+        this.controller.trigger( 'attachment:compat:waiting', ['waiting'] );
+        this.model.saveCompat( data ).always( _.bind( this.postSave, this ) );
+    },
+
+    postSave: function() {
+        this.controller.trigger( 'attachment:compat:ready', ['ready'] );
     }
-
 });
 
-module.exports = EditImage;
-
-},{}],38:[function(require,module,exports){
+module.exports = AttachmentCompat;
+
+
+/***/ }),
+/* 89 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.Iframe
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Iframe = wp.media.View.extend({
+    className: 'media-iframe',
+    /**
+     * @returns {wp.media.view.Iframe} Returns itself to allow chaining
+     */
+    render: function() {
+        this.views.detach();
+        this.$el.html( '<iframe src="' + this.controller.state().get('src') + '" />' );
+        this.views.render();
+        return this;
+    }
+});
+
+module.exports = Iframe;
+
+
+/***/ }),
+/* 90 */
+/***/ (function(module, exports) {
+
 /**
  * wp.media.view.Embed
@@ -4486 +8159 @@
 module.exports = Embed;
 
-},{}],39:[function(require,module,exports){
+
+/***/ }),
+/* 91 */
+/***/ (function(module, exports) {
+
 /**
- * wp.media.view.EmbedImage
+ * wp.media.view.Label
  *
  * @class
- * @augments wp.media.view.Settings.AttachmentDisplay
- * @augments wp.media.view.Settings
  * @augments wp.media.View
  * @augments wp.Backbone.View
  * @augments Backbone.View
  */
-var AttachmentDisplay = wp.media.view.Settings.AttachmentDisplay,
-    EmbedImage;
-
-EmbedImage = AttachmentDisplay.extend({
-    className: 'embed-media-settings',
-    template:  wp.template('embed-image-settings'),
+var Label = wp.media.View.extend({
+    tagName: 'label',
+    className: 'screen-reader-text',
 
     initialize: function() {
-        /**
-         * Call `initialize` directly on parent class with passed arguments
-         */
-        AttachmentDisplay.prototype.initialize.apply( this, arguments );
-        this.listenTo( this.model, 'change:url', this.updateImage );
-    },
-
-    updateImage: function() {
-        this.$('img').attr( 'src', this.model.get('url') );
+        this.value = this.options.value;
+    },
+
+    render: function() {
+        this.$el.html( this.value );
+
+        return this;
     }
 });
 
-module.exports = EmbedImage;
-
-},{}],40:[function(require,module,exports){
+module.exports = Label;
+
+
+/***/ }),
+/* 92 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.EmbedUrl
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var View = wp.media.View,
+    $ = jQuery,
+    EmbedUrl;
+
+EmbedUrl = View.extend({
+    tagName:   'label',
+    className: 'embed-url',
+
+    events: {
+        'input':  'url',
+        'keyup':  'url',
+        'change': 'url'
+    },
+
+    initialize: function() {
+        this.$input = $('<input id="embed-url-field" type="url" />').val( this.model.get('url') );
+        this.input = this.$input[0];
+
+        this.spinner = $('<span class="spinner" />')[0];
+        this.$el.append([ this.input, this.spinner ]);
+
+        this.listenTo( this.model, 'change:url', this.render );
+
+        if ( this.model.get( 'url' ) ) {
+            _.delay( _.bind( function () {
+                this.model.trigger( 'change:url' );
+            }, this ), 500 );
+        }
+    },
+    /**
+     * @returns {wp.media.view.EmbedUrl} Returns itself to allow chaining
+     */
+    render: function() {
+        var $input = this.$input;
+
+        if ( $input.is(':focus') ) {
+            return;
+        }
+
+        this.input.value = this.model.get('url') || 'http://';
+        /**
+         * Call `render` directly on parent class with passed arguments
+         */
+        View.prototype.render.apply( this, arguments );
+        return this;
+    },
+
+    ready: function() {
+        if ( ! wp.media.isTouchDevice ) {
+            this.focus();
+        }
+    },
+
+    url: function( event ) {
+        this.model.set( 'url', event.target.value );
+    },
+
+    /**
+     * If the input is visible, focus and select its contents.
+     */
+    focus: function() {
+        var $input = this.$input;
+        if ( $input.is(':visible') ) {
+            $input.focus()[0].select();
+        }
+    }
+});
+
+module.exports = EmbedUrl;
+
+
+/***/ }),
+/* 93 */
+/***/ (function(module, exports) {
+
 /**
  * wp.media.view.EmbedLink
@@ -4608 +8365 @@
 module.exports = EmbedLink;
 
-},{}],41:[function(require,module,exports){
+
+/***/ }),
+/* 94 */
+/***/ (function(module, exports) {
+
 /**
- * wp.media.view.EmbedUrl
+ * wp.media.view.EmbedImage
  *
  * @class
+ * @augments wp.media.view.Settings.AttachmentDisplay
+ * @augments wp.media.view.Settings
  * @augments wp.media.View
  * @augments wp.Backbone.View
  * @augments Backbone.View
  */
-var View = wp.media.View,
-    $ = jQuery,
-    EmbedUrl;
-
-EmbedUrl = View.extend({
-    tagName:   'label',
-    className: 'embed-url',
-
-    events: {
-        'input':  'url',
-        'keyup':  'url',
-        'change': 'url'
-    },
+var AttachmentDisplay = wp.media.view.Settings.AttachmentDisplay,
+    EmbedImage;
+
+EmbedImage = AttachmentDisplay.extend({
+    className: 'embed-media-settings',
+    template:  wp.template('embed-image-settings'),
 
     initialize: function() {
-        this.$input = $('<input id="embed-url-field" type="url" />').val( this.model.get('url') );
-        this.input = this.$input[0];
-
-        this.spinner = $('<span class="spinner" />')[0];
-        this.$el.append([ this.input, this.spinner ]);
-
-        this.listenTo( this.model, 'change:url', this.render );
-
-        if ( this.model.get( 'url' ) ) {
-            _.delay( _.bind( function () {
-                this.model.trigger( 'change:url' );
-            }, this ), 500 );
-        }
-    },
-    /**
-     * @returns {wp.media.view.EmbedUrl} Returns itself to allow chaining
-     */
-    render: function() {
-        var $input = this.$input;
-
-        if ( $input.is(':focus') ) {
-            return;
-        }
-
-        this.input.value = this.model.get('url') || 'http://';
         /**
-         * Call `render` directly on parent class with passed arguments
+         * Call `initialize` directly on parent class with passed arguments
          */
-        View.prototype.render.apply( this, arguments );
-        return this;
-    },
-
-    ready: function() {
-        if ( ! wp.media.isTouchDevice ) {
-            this.focus();
-        }
-    },
-
-    url: function( event ) {
-        this.model.set( 'url', event.target.value );
-    },
-
-    /**
-     * If the input is visible, focus and select its contents.
-     */
-    focus: function() {
-        var $input = this.$input;
-        if ( $input.is(':visible') ) {
-            $input.focus()[0].select();
-        }
+        AttachmentDisplay.prototype.initialize.apply( this, arguments );
+        this.listenTo( this.model, 'change:url', this.updateImage );
+    },
+
+    updateImage: function() {
+        this.$('img').attr( 'src', this.model.get('url') );
     }
 });
 
-module.exports = EmbedUrl;
-
-},{}],42:[function(require,module,exports){
-/**
- * wp.media.view.FocusManager
- *
- * @class
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var FocusManager = wp.media.View.extend({
-
-    events: {
-        'keydown': 'constrainTabbing'
-    },
-
-    focus: function() { // Reset focus on first left menu item
-        this.$('.media-menu-item').first().focus();
-    },
-    /**
-     * @param {Object} event
-     */
-    constrainTabbing: function( event ) {
-        var tabbables;
-
-        // Look for the tab key.
-        if ( 9 !== event.keyCode ) {
-            return;
-        }
-
-        // Skip the file input added by Plupload.
-        tabbables = this.$( ':tabbable' ).not( '.moxie-shim input[type="file"]' );
-
-        // Keep tab focus within media modal while it's open
-        if ( tabbables.last()[0] === event.target && ! event.shiftKey ) {
-            tabbables.first().focus();
-            return false;
-        } else if ( tabbables.first()[0] === event.target && event.shiftKey ) {
-            tabbables.last().focus();
-            return false;
-        }
-    }
-
-});
-
-module.exports = FocusManager;
-
-},{}],43:[function(require,module,exports){
-/**
- * wp.media.view.Frame
- *
- * A frame is a composite view consisting of one or more regions and one or more
- * states.
- *
- * @see wp.media.controller.State
- * @see wp.media.controller.Region
- *
- * @class
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- * @mixes wp.media.controller.StateMachine
- */
-var Frame = wp.media.View.extend({
-    initialize: function() {
-        _.defaults( this.options, {
-            mode: [ 'select' ]
-        });
-        this._createRegions();
-        this._createStates();
-        this._createModes();
-    },
-
-    _createRegions: function() {
-        // Clone the regions array.
-        this.regions = this.regions ? this.regions.slice() : [];
-
-        // Initialize regions.
-        _.each( this.regions, function( region ) {
-            this[ region ] = new wp.media.controller.Region({
-                view:     this,
-                id:       region,
-                selector: '.media-frame-' + region
-            });
-        }, this );
-    },
-    /**
-     * Create the frame's states.
-     *
-     * @see wp.media.controller.State
-     * @see wp.media.controller.StateMachine
-     *
-     * @fires wp.media.controller.State#ready
-     */
-    _createStates: function() {
-        // Create the default `states` collection.
-        this.states = new Backbone.Collection( null, {
-            model: wp.media.controller.State
-        });
-
-        // Ensure states have a reference to the frame.
-        this.states.on( 'add', function( model ) {
-            model.frame = this;
-            model.trigger('ready');
-        }, this );
-
-        if ( this.options.states ) {
-            this.states.add( this.options.states );
-        }
-    },
-
-    /**
-     * A frame can be in a mode or multiple modes at one time.
-     *
-     * For example, the manage media frame can be in the `Bulk Select` or `Edit` mode.
-     */
-    _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 );
-    },
-    /**
-     * Reset all states on the frame to their defaults.
-     *
-     * @returns {wp.media.view.Frame} Returns itself to allow chaining
-     */
-    reset: function() {
-        this.states.invoke( 'trigger', 'reset' );
-        return this;
-    },
-    /**
-     * Map activeMode collection events to the frame.
-     */
-    triggerModeEvents: function( model, collection, options ) {
-        var collectionEvent,
-            modeEventMap = {
-                add: 'activate',
-                remove: 'deactivate'
-            },
-            eventToTrigger;
-        // Probably a better way to do this.
-        _.each( options, function( value, key ) {
-            if ( value ) {
-                collectionEvent = key;
-            }
-        } );
-
-        if ( ! _.has( modeEventMap, collectionEvent ) ) {
-            return;
-        }
-
-        eventToTrigger = model.get('id') + ':' + modeEventMap[collectionEvent];
-        this.trigger( eventToTrigger );
-    },
-    /**
-     * Activate a mode on the frame.
-     *
-     * @param string mode Mode ID.
-     * @returns {this} Returns itself to allow chaining.
-     */
-    activateMode: function( mode ) {
-        // Bail if the mode is already active.
-        if ( this.isModeActive( mode ) ) {
-            return;
-        }
-        this.activeModes.add( [ { id: mode } ] );
-        // Add a CSS class to the frame so elements can be styled for the mode.
-        this.$el.addClass( 'mode-' + mode );
-
-        return this;
-    },
-    /**
-     * Deactivate a mode on the frame.
-     *
-     * @param string mode Mode ID.
-     * @returns {this} Returns itself to allow chaining.
-     */
-    deactivateMode: function( mode ) {
-        // Bail if the mode isn't active.
-        if ( ! this.isModeActive( mode ) ) {
-            return this;
-        }
-        this.activeModes.remove( this.activeModes.where( { id: mode } ) );
-        this.$el.removeClass( 'mode-' + mode );
-        /**
-         * Frame mode deactivation event.
-         *
-         * @event this#{mode}:deactivate
-         */
-        this.trigger( mode + ':deactivate' );
-
-        return this;
-    },
-    /**
-     * Check if a mode is enabled on the frame.
-     *
-     * @param  string mode Mode ID.
-     * @return bool
-     */
-    isModeActive: function( mode ) {
-        return Boolean( this.activeModes.where( { id: mode } ).length );
-    }
-});
-
-// Make the `Frame` a `StateMachine`.
-_.extend( Frame.prototype, wp.media.controller.StateMachine.prototype );
-
-module.exports = Frame;
-
-},{}],44:[function(require,module,exports){
-/**
- * wp.media.view.MediaFrame.ImageDetails
- *
- * A media frame for manipulating an image that's already been inserted
- * into a post.
- *
- * @class
- * @augments wp.media.view.MediaFrame.Select
- * @augments wp.media.view.MediaFrame
- * @augments wp.media.view.Frame
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- * @mixes wp.media.controller.StateMachine
- */
-var Select = wp.media.view.MediaFrame.Select,
-    l10n = wp.media.view.l10n,
-    ImageDetails;
-
-ImageDetails = Select.extend({
-    defaults: {
-        id:      'image',
-        url:     '',
-        menu:    'image-details',
-        content: 'image-details',
-        toolbar: 'image-details',
-        type:    'link',
-        title:    l10n.imageDetailsTitle,
-        priority: 120
-    },
-
-    initialize: function( options ) {
-        this.image = new wp.media.model.PostImage( options.metadata );
-        this.options.selection = new wp.media.model.Selection( this.image.attachment, { multiple: false } );
-        Select.prototype.initialize.apply( this, arguments );
-    },
-
-    bindHandlers: function() {
-        Select.prototype.bindHandlers.apply( this, arguments );
-        this.on( 'menu:create:image-details', this.createMenu, this );
-        this.on( 'content:create:image-details', this.imageDetailsContent, this );
-        this.on( 'content:render:edit-image', this.editImageContent, this );
-        this.on( 'toolbar:render:image-details', this.renderImageDetailsToolbar, this );
-        // override the select toolbar
-        this.on( 'toolbar:render:replace', this.renderReplaceImageToolbar, this );
-    },
-
-    createStates: function() {
-        this.states.add([
-            new wp.media.controller.ImageDetails({
-                image: this.image,
-                editable: false
-            }),
-            new wp.media.controller.ReplaceImage({
-                id: 'replace-image',
-                library: wp.media.query( { type: 'image' } ),
-                image: this.image,
-                multiple:  false,
-                title:     l10n.imageReplaceTitle,
-                toolbar: 'replace',
-                priority:  80,
-                displaySettings: true
-            }),
-            new wp.media.controller.EditImage( {
-                image: this.image,
-                selection: this.options.selection
-            } )
-        ]);
-    },
-
-    imageDetailsContent: function( options ) {
-        options.view = new wp.media.view.ImageDetails({
-            controller: this,
-            model: this.state().image,
-            attachment: this.state().image.attachment
-        });
-    },
-
-    editImageContent: function() {
-        var state = this.state(),
-            model = state.get('image'),
-            view;
-
-        if ( ! model ) {
-            return;
-        }
-
-        view = new wp.media.view.EditImage( { model: model, controller: this } ).render();
-
-        this.content.set( view );
-
-        // after bringing in the frame, load the actual editor via an ajax call
-        view.loadEditor();
-
-    },
-
-    renderImageDetailsToolbar: function() {
-        this.toolbar.set( new wp.media.view.Toolbar({
-            controller: this,
-            items: {
-                select: {
-                    style:    'primary',
-                    text:     l10n.update,
-                    priority: 80,
-
-                    click: function() {
-                        var controller = this.controller,
-                            state = controller.state();
-
-                        controller.close();
-
-                        // not sure if we want to use wp.media.string.image which will create a shortcode or
-                        // perhaps wp.html.string to at least to build the <img />
-                        state.trigger( 'update', controller.image.toJSON() );
-
-                        // Restore and reset the default state.
-                        controller.setState( controller.options.state );
-                        controller.reset();
-                    }
-                }
-            }
-        }) );
-    },
-
-    renderReplaceImageToolbar: function() {
-        var frame = this,
-            lastState = frame.lastState(),
-            previous = lastState && lastState.id;
-
-        this.toolbar.set( new wp.media.view.Toolbar({
-            controller: this,
-            items: {
-                back: {
-                    text:     l10n.back,
-                    priority: 20,
-                    click:    function() {
-                        if ( previous ) {
-                            frame.setState( previous );
-                        } else {
-                            frame.close();
-                        }
-                    }
-                },
-
-                replace: {
-                    style:    'primary',
-                    text:     l10n.replace,
-                    priority: 80,
-
-                    click: function() {
-                        var controller = this.controller,
-                            state = controller.state(),
-                            selection = state.get( 'selection' ),
-                            attachment = selection.single();
-
-                        controller.close();
-
-                        controller.image.changeAttachment( attachment, state.display( attachment ) );
-
-                        // not sure if we want to use wp.media.string.image which will create a shortcode or
-                        // perhaps wp.html.string to at least to build the <img />
-                        state.trigger( 'replace', controller.image.toJSON() );
-
-                        // Restore and reset the default state.
-                        controller.setState( controller.options.state );
-                        controller.reset();
-                    }
-                }
-            }
-        }) );
-    }
-
-});
-
-module.exports = ImageDetails;
-
-},{}],45:[function(require,module,exports){
-/**
- * wp.media.view.MediaFrame.Post
- *
- * The frame for manipulating media on the Edit Post page.
- *
- * @class
- * @augments wp.media.view.MediaFrame.Select
- * @augments wp.media.view.MediaFrame
- * @augments wp.media.view.Frame
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- * @mixes wp.media.controller.StateMachine
- */
-var Select = wp.media.view.MediaFrame.Select,
-    Library = wp.media.controller.Library,
-    l10n = wp.media.view.l10n,
-    Post;
-
-Post = Select.extend({
-    initialize: function() {
-        this.counts = {
-            audio: {
-                count: wp.media.view.settings.attachmentCounts.audio,
-                state: 'playlist'
-            },
-            video: {
-                count: wp.media.view.settings.attachmentCounts.video,
-                state: 'video-playlist'
-            }
-        };
-
-        _.defaults( this.options, {
-            multiple:  true,
-            editing:   false,
-            state:    'insert',
-            metadata:  {}
-        });
-
-        // Call 'initialize' directly on the parent class.
-        Select.prototype.initialize.apply( this, arguments );
-        this.createIframeStates();
-
-    },
-
-    /**
-     * Create the default states.
-     */
-    createStates: function() {
-        var options = this.options;
-
-        this.states.add([
-            // Main states.
-            new Library({
-                id:         'insert',
-                title:      l10n.insertMediaTitle,
-                priority:   20,
-                toolbar:    'main-insert',
-                filterable: 'all',
-                library:    wp.media.query( options.library ),
-                multiple:   options.multiple ? 'reset' : false,
-                editable:   true,
-
-                // If the user isn't allowed to edit fields,
-                // can they still edit it locally?
-                allowLocalEdits: true,
-
-                // Show the attachment display settings.
-                displaySettings: true,
-                // Update user settings when users adjust the
-                // attachment display settings.
-                displayUserSettings: true
-            }),
-
-            new Library({
-                id:         'gallery',
-                title:      l10n.createGalleryTitle,
-                priority:   40,
-                toolbar:    'main-gallery',
-                filterable: 'uploaded',
-                multiple:   'add',
-                editable:   false,
-
-                library:  wp.media.query( _.defaults({
-                    type: 'image'
-                }, options.library ) )
-            }),
-
-            // Embed states.
-            new wp.media.controller.Embed( { metadata: options.metadata } ),
-
-            new wp.media.controller.EditImage( { model: options.editImage } ),
-
-            // Gallery states.
-            new wp.media.controller.GalleryEdit({
-                library: options.selection,
-                editing: options.editing,
-                menu:    'gallery'
-            }),
-
-            new wp.media.controller.GalleryAdd(),
-
-            new Library({
-                id:         'playlist',
-                title:      l10n.createPlaylistTitle,
-                priority:   60,
-                toolbar:    'main-playlist',
-                filterable: 'uploaded',
-                multiple:   'add',
-                editable:   false,
-
-                library:  wp.media.query( _.defaults({
-                    type: 'audio'
-                }, options.library ) )
-            }),
-
-            // Playlist states.
-            new wp.media.controller.CollectionEdit({
-                type: 'audio',
-                collectionType: 'playlist',
-                title:          l10n.editPlaylistTitle,
-                SettingsView:   wp.media.view.Settings.Playlist,
-                library:        options.selection,
-                editing:        options.editing,
-                menu:           'playlist',
-                dragInfoText:   l10n.playlistDragInfo,
-                dragInfo:       false
-            }),
-
-            new wp.media.controller.CollectionAdd({
-                type: 'audio',
-                collectionType: 'playlist',
-                title: l10n.addToPlaylistTitle
-            }),
-
-            new Library({
-                id:         'video-playlist',
-                title:      l10n.createVideoPlaylistTitle,
-                priority:   60,
-                toolbar:    'main-video-playlist',
-                filterable: 'uploaded',
-                multiple:   'add',
-                editable:   false,
-
-                library:  wp.media.query( _.defaults({
-                    type: 'video'
-                }, options.library ) )
-            }),
-
-            new wp.media.controller.CollectionEdit({
-                type: 'video',
-                collectionType: 'playlist',
-                title:          l10n.editVideoPlaylistTitle,
-                SettingsView:   wp.media.view.Settings.Playlist,
-                library:        options.selection,
-                editing:        options.editing,
-                menu:           'video-playlist',
-                dragInfoText:   l10n.videoPlaylistDragInfo,
-                dragInfo:       false
-            }),
-
-            new wp.media.controller.CollectionAdd({
-                type: 'video',
-                collectionType: 'playlist',
-                title: l10n.addToVideoPlaylistTitle
-            })
-        ]);
-
-        if ( wp.media.view.settings.post.featuredImageId ) {
-            this.states.add( new wp.media.controller.FeaturedImage() );
-        }
-    },
-
-    bindHandlers: function() {
-        var handlers, checkCounts;
-
-        Select.prototype.bindHandlers.apply( this, arguments );
-
-        this.on( 'activate', this.activate, this );
-
-        // Only bother checking media type counts if one of the counts is zero
-        checkCounts = _.find( this.counts, function( type ) {
-            return type.count === 0;
-        } );
-
-        if ( typeof checkCounts !== 'undefined' ) {
-            this.listenTo( wp.media.model.Attachments.all, 'change:type', this.mediaTypeCounts );
-        }
-
-        this.on( 'menu:create:gallery', this.createMenu, this );
-        this.on( 'menu:create:playlist', this.createMenu, this );
-        this.on( 'menu:create:video-playlist', this.createMenu, this );
-        this.on( 'toolbar:create:main-insert', this.createToolbar, this );
-        this.on( 'toolbar:create:main-gallery', this.createToolbar, this );
-        this.on( 'toolbar:create:main-playlist', this.createToolbar, this );
-        this.on( 'toolbar:create:main-video-playlist', this.createToolbar, this );
-        this.on( 'toolbar:create:featured-image', this.featuredImageToolbar, this );
-        this.on( 'toolbar:create:main-embed', this.mainEmbedToolbar, this );
-
-        handlers = {
-            menu: {
-                'default': 'mainMenu',
-                'gallery': 'galleryMenu',
-                'playlist': 'playlistMenu',
-                'video-playlist': 'videoPlaylistMenu'
-            },
-
-            content: {
-                'embed':          'embedContent',
-                'edit-image':     'editImageContent',
-                'edit-selection': 'editSelectionContent'
-            },
-
-            toolbar: {
-                'main-insert':      'mainInsertToolbar',
-                'main-gallery':     'mainGalleryToolbar',
-                'gallery-edit':     'galleryEditToolbar',
-                'gallery-add':      'galleryAddToolbar',
-                'main-playlist':    'mainPlaylistToolbar',
-                'playlist-edit':    'playlistEditToolbar',
-                'playlist-add':     'playlistAddToolbar',
-                'main-video-playlist': 'mainVideoPlaylistToolbar',
-                'video-playlist-edit': 'videoPlaylistEditToolbar',
-                'video-playlist-add': 'videoPlaylistAddToolbar'
-            }
-        };
-
-        _.each( handlers, function( regionHandlers, region ) {
-            _.each( regionHandlers, function( callback, handler ) {
-                this.on( region + ':render:' + handler, this[ callback ], this );
-            }, this );
-        }, this );
-    },
-
-    activate: function() {
-        // Hide menu items for states tied to particular media types if there are no items
-        _.each( this.counts, function( type ) {
-            if ( type.count < 1 ) {
-                this.menuItemVisibility( type.state, 'hide' );
-            }
-        }, this );
-    },
-
-    mediaTypeCounts: function( model, attr ) {
-        if ( typeof this.counts[ attr ] !== 'undefined' && this.counts[ attr ].count < 1 ) {
-            this.counts[ attr ].count++;
-            this.menuItemVisibility( this.counts[ attr ].state, 'show' );
-        }
-    },
-
-    // Menus
-    /**
-     * @param {wp.Backbone.View} view
-     */
-    mainMenu: function( view ) {
-        view.set({
-            'library-separator': new wp.media.View({
-                className: 'separator',
-                priority: 100
-            })
-        });
-    },
-
-    menuItemVisibility: function( state, visibility ) {
-        var menu = this.menu.get();
-        if ( visibility === 'hide' ) {
-            menu.hide( state );
-        } else if ( visibility === 'show' ) {
-            menu.show( state );
-        }
-    },
-    /**
-     * @param {wp.Backbone.View} view
-     */
-    galleryMenu: function( view ) {
-        var lastState = this.lastState(),
-            previous = lastState && lastState.id,
-            frame = this;
-
-        view.set({
-            cancel: {
-                text:     l10n.cancelGalleryTitle,
-                priority: 20,
-                click:    function() {
-                    if ( previous ) {
-                        frame.setState( previous );
-                    } else {
-                        frame.close();
-                    }
-
-                    // Keep focus inside media modal
-                    // after canceling a gallery
-                    this.controller.modal.focusManager.focus();
-                }
-            },
-            separateCancel: new wp.media.View({
-                className: 'separator',
-                priority: 40
-            })
-        });
-    },
-
-    playlistMenu: function( view ) {
-        var lastState = this.lastState(),
-            previous = lastState && lastState.id,
-            frame = this;
-
-        view.set({
-            cancel: {
-                text:     l10n.cancelPlaylistTitle,
-                priority: 20,
-                click:    function() {
-                    if ( previous ) {
-                        frame.setState( previous );
-                    } else {
-                        frame.close();
-                    }
-                }
-            },
-            separateCancel: new wp.media.View({
-                className: 'separator',
-                priority: 40
-            })
-        });
-    },
-
-    videoPlaylistMenu: function( view ) {
-        var lastState = this.lastState(),
-            previous = lastState && lastState.id,
-            frame = this;
-
-        view.set({
-            cancel: {
-                text:     l10n.cancelVideoPlaylistTitle,
-                priority: 20,
-                click:    function() {
-                    if ( previous ) {
-                        frame.setState( previous );
-                    } else {
-                        frame.close();
-                    }
-                }
-            },
-            separateCancel: new wp.media.View({
-                className: 'separator',
-                priority: 40
-            })
-        });
-    },
-
-    // Content
-    embedContent: function() {
-        var view = new wp.media.view.Embed({
-            controller: this,
-            model:      this.state()
-        }).render();
-
-        this.content.set( view );
-
-        if ( ! wp.media.isTouchDevice ) {
-            view.url.focus();
-        }
-    },
-
-    editSelectionContent: function() {
-        var state = this.state(),
-            selection = state.get('selection'),
-            view;
-
-        view = new wp.media.view.AttachmentsBrowser({
-            controller: this,
-            collection: selection,
-            selection:  selection,
-            model:      state,
-            sortable:   true,
-            search:     false,
-            date:       false,
-            dragInfo:   true,
-
-            AttachmentView: wp.media.view.Attachments.EditSelection
-        }).render();
-
-        view.toolbar.set( 'backToLibrary', {
-            text:     l10n.returnToLibrary,
-            priority: -100,
-
-            click: function() {
-                this.controller.content.mode('browse');
-            }
-        });
-
-        // Browse our library of attachments.
-        this.content.set( view );
-
-        // Trigger the controller to set focus
-        this.trigger( 'edit:selection', this );
-    },
-
-    editImageContent: function() {
-        var image = this.state().get('image'),
-            view = new wp.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();
-
-    },
-
-    // Toolbars
-
-    /**
-     * @param {wp.Backbone.View} view
-     */
-    selectionStatusToolbar: function( view ) {
-        var editable = this.state().get('editable');
-
-        view.set( 'selection', new wp.media.view.Selection({
-            controller: this,
-            collection: this.state().get('selection'),
-            priority:   -40,
-
-            // If the selection is editable, pass the callback to
-            // switch the content mode.
-            editable: editable && function() {
-                this.controller.content.mode('edit-selection');
-            }
-        }).render() );
-    },
-
-    /**
-     * @param {wp.Backbone.View} view
-     */
-    mainInsertToolbar: function( view ) {
-        var controller = this;
-
-        this.selectionStatusToolbar( view );
-
-        view.set( 'insert', {
-            style:    'primary',
-            priority: 80,
-            text:     l10n.insertIntoPost,
-            requires: { selection: true },
-
-            /**
-             * @fires wp.media.controller.State#insert
-             */
-            click: function() {
-                var state = controller.state(),
-                    selection = state.get('selection');
-
-                controller.close();
-                state.trigger( 'insert', selection ).reset();
-            }
-        });
-    },
-
-    /**
-     * @param {wp.Backbone.View} view
-     */
-    mainGalleryToolbar: function( view ) {
-        var controller = this;
-
-        this.selectionStatusToolbar( view );
-
-        view.set( 'gallery', {
-            style:    'primary',
-            text:     l10n.createNewGallery,
-            priority: 60,
-            requires: { selection: true },
-
-            click: function() {
-                var selection = controller.state().get('selection'),
-                    edit = controller.state('gallery-edit'),
-                    models = selection.where({ type: 'image' });
-
-                edit.set( 'library', new wp.media.model.Selection( models, {
-                    props:    selection.props.toJSON(),
-                    multiple: true
-                }) );
-
-                this.controller.setState('gallery-edit');
-
-                // Keep focus inside media modal
-                // after jumping to gallery view
-                this.controller.modal.focusManager.focus();
-            }
-        });
-    },
-
-    mainPlaylistToolbar: function( view ) {
-        var controller = this;
-
-        this.selectionStatusToolbar( view );
-
-        view.set( 'playlist', {
-            style:    'primary',
-            text:     l10n.createNewPlaylist,
-            priority: 100,
-            requires: { selection: true },
-
-            click: function() {
-                var selection = controller.state().get('selection'),
-                    edit = controller.state('playlist-edit'),
-                    models = selection.where({ type: 'audio' });
-
-                edit.set( 'library', new wp.media.model.Selection( models, {
-                    props:    selection.props.toJSON(),
-                    multiple: true
-                }) );
-
-                this.controller.setState('playlist-edit');
-
-                // Keep focus inside media modal
-                // after jumping to playlist view
-                this.controller.modal.focusManager.focus();
-            }
-        });
-    },
-
-    mainVideoPlaylistToolbar: function( view ) {
-        var controller = this;
-
-        this.selectionStatusToolbar( view );
-
-        view.set( 'video-playlist', {
-            style:    'primary',
-            text:     l10n.createNewVideoPlaylist,
-            priority: 100,
-            requires: { selection: true },
-
-            click: function() {
-                var selection = controller.state().get('selection'),
-                    edit = controller.state('video-playlist-edit'),
-                    models = selection.where({ type: 'video' });
-
-                edit.set( 'library', new wp.media.model.Selection( models, {
-                    props:    selection.props.toJSON(),
-                    multiple: true
-                }) );
-
-                this.controller.setState('video-playlist-edit');
-
-                // Keep focus inside media modal
-                // after jumping to video playlist view
-                this.controller.modal.focusManager.focus();
-            }
-        });
-    },
-
-    featuredImageToolbar: function( toolbar ) {
-        this.createSelectToolbar( toolbar, {
-            text:  l10n.setFeaturedImage,
-            state: this.options.state
-        });
-    },
-
-    mainEmbedToolbar: function( toolbar ) {
-        toolbar.view = new wp.media.view.Toolbar.Embed({
-            controller: this
-        });
-    },
-
-    galleryEditToolbar: function() {
-        var editing = this.state().get('editing');
-        this.toolbar.set( new wp.media.view.Toolbar({
-            controller: this,
-            items: {
-                insert: {
-                    style:    'primary',
-                    text:     editing ? l10n.updateGallery : l10n.insertGallery,
-                    priority: 80,
-                    requires: { library: true },
-
-                    /**
-                     * @fires wp.media.controller.State#update
-                     */
-                    click: function() {
-                        var controller = this.controller,
-                            state = controller.state();
-
-                        controller.close();
-                        state.trigger( 'update', state.get('library') );
-
-                        // Restore and reset the default state.
-                        controller.setState( controller.options.state );
-                        controller.reset();
-                    }
-                }
-            }
-        }) );
-    },
-
-    galleryAddToolbar: function() {
-        this.toolbar.set( new wp.media.view.Toolbar({
-            controller: this,
-            items: {
-                insert: {
-                    style:    'primary',
-                    text:     l10n.addToGallery,
-                    priority: 80,
-                    requires: { selection: true },
-
-                    /**
-                     * @fires wp.media.controller.State#reset
-                     */
-                    click: function() {
-                        var controller = this.controller,
-                            state = controller.state(),
-                            edit = controller.state('gallery-edit');
-
-                        edit.get('library').add( state.get('selection').models );
-                        state.trigger('reset');
-                        controller.setState('gallery-edit');
-                    }
-                }
-            }
-        }) );
-    },
-
-    playlistEditToolbar: function() {
-        var editing = this.state().get('editing');
-        this.toolbar.set( new wp.media.view.Toolbar({
-            controller: this,
-            items: {
-                insert: {
-                    style:    'primary',
-                    text:     editing ? l10n.updatePlaylist : l10n.insertPlaylist,
-                    priority: 80,
-                    requires: { library: true },
-
-                    /**
-                     * @fires wp.media.controller.State#update
-                     */
-                    click: function() {
-                        var controller = this.controller,
-                            state = controller.state();
-
-                        controller.close();
-                        state.trigger( 'update', state.get('library') );
-
-                        // Restore and reset the default state.
-                        controller.setState( controller.options.state );
-                        controller.reset();
-                    }
-                }
-            }
-        }) );
-    },
-
-    playlistAddToolbar: function() {
-        this.toolbar.set( new wp.media.view.Toolbar({
-            controller: this,
-            items: {
-                insert: {
-                    style:    'primary',
-                    text:     l10n.addToPlaylist,
-                    priority: 80,
-                    requires: { selection: true },
-
-                    /**
-                     * @fires wp.media.controller.State#reset
-                     */
-                    click: function() {
-                        var controller = this.controller,
-                            state = controller.state(),
-                            edit = controller.state('playlist-edit');
-
-                        edit.get('library').add( state.get('selection').models );
-                        state.trigger('reset');
-                        controller.setState('playlist-edit');
-                    }
-                }
-            }
-        }) );
-    },
-
-    videoPlaylistEditToolbar: function() {
-        var editing = this.state().get('editing');
-        this.toolbar.set( new wp.media.view.Toolbar({
-            controller: this,
-            items: {
-                insert: {
-                    style:    'primary',
-                    text:     editing ? l10n.updateVideoPlaylist : l10n.insertVideoPlaylist,
-                    priority: 140,
-                    requires: { library: true },
-
-                    click: function() {
-                        var controller = this.controller,
-                            state = controller.state(),
-                            library = state.get('library');
-
-                        library.type = 'video';
-
-                        controller.close();
-                        state.trigger( 'update', library );
-
-                        // Restore and reset the default state.
-                        controller.setState( controller.options.state );
-                        controller.reset();
-                    }
-                }
-            }
-        }) );
-    },
-
-    videoPlaylistAddToolbar: function() {
-        this.toolbar.set( new wp.media.view.Toolbar({
-            controller: this,
-            items: {
-                insert: {
-                    style:    'primary',
-                    text:     l10n.addToVideoPlaylist,
-                    priority: 140,
-                    requires: { selection: true },
-
-                    click: function() {
-                        var controller = this.controller,
-                            state = controller.state(),
-                            edit = controller.state('video-playlist-edit');
-
-                        edit.get('library').add( state.get('selection').models );
-                        state.trigger('reset');
-                        controller.setState('video-playlist-edit');
-                    }
-                }
-            }
-        }) );
-    }
-});
-
-module.exports = Post;
-
-},{}],46:[function(require,module,exports){
-/**
- * wp.media.view.MediaFrame.Select
- *
- * A frame for selecting an item or items from the media library.
- *
- * @class
- * @augments wp.media.view.MediaFrame
- * @augments wp.media.view.Frame
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- * @mixes wp.media.controller.StateMachine
- */
-
-var MediaFrame = wp.media.view.MediaFrame,
-    l10n = wp.media.view.l10n,
-    Select;
-
-Select = MediaFrame.extend({
-    initialize: function() {
-        // Call 'initialize' directly on the parent class.
-        MediaFrame.prototype.initialize.apply( this, arguments );
-
-        _.defaults( this.options, {
-            selection: [],
-            library:   {},
-            multiple:  false,
-            state:    'library'
-        });
-
-        this.createSelection();
-        this.createStates();
-        this.bindHandlers();
-    },
-
-    /**
-     * Attach a selection collection to the frame.
-     *
-     * A selection is a collection of attachments used for a specific purpose
-     * by a media frame. e.g. Selecting an attachment (or many) to insert into
-     * post content.
-     *
-     * @see media.model.Selection
-     */
-    createSelection: function() {
-        var selection = this.options.selection;
-
-        if ( ! (selection instanceof wp.media.model.Selection) ) {
-            this.options.selection = new wp.media.model.Selection( selection, {
-                multiple: this.options.multiple
-            });
-        }
-
-        this._selection = {
-            attachments: new wp.media.model.Attachments(),
-            difference: []
-        };
-    },
-
-    /**
-     * Create the default states on the frame.
-     */
-    createStates: function() {
-        var options = this.options;
-
-        if ( this.options.states ) {
-            return;
-        }
-
-        // Add the default states.
-        this.states.add([
-            // Main states.
-            new wp.media.controller.Library({
-                library:   wp.media.query( options.library ),
-                multiple:  options.multiple,
-                title:     options.title,
-                priority:  20
-            })
-        ]);
-    },
-
-    /**
-     * Bind region mode event callbacks.
-     *
-     * @see media.controller.Region.render
-     */
-    bindHandlers: function() {
-        this.on( 'router:create:browse', this.createRouter, this );
-        this.on( 'router:render:browse', this.browseRouter, this );
-        this.on( 'content:create:browse', this.browseContent, this );
-        this.on( 'content:render:upload', this.uploadContent, this );
-        this.on( 'toolbar:create:select', this.createSelectToolbar, this );
-    },
-
-    /**
-     * Render callback for the router region in the `browse` mode.
-     *
-     * @param {wp.media.view.Router} routerView
-     */
-    browseRouter: function( routerView ) {
-        routerView.set({
-            upload: {
-                text:     l10n.uploadFilesTitle,
-                priority: 20
-            },
-            browse: {
-                text:     l10n.mediaLibraryTitle,
-                priority: 40
-            }
-        });
-    },
-
-    /**
-     * Render callback for the content region in the `browse` mode.
-     *
-     * @param {wp.media.controller.Region} contentRegion
-     */
-    browseContent: function( contentRegion ) {
-        var state = this.state();
-
-        this.$el.removeClass('hide-toolbar');
-
-        // Browse our library of attachments.
-        contentRegion.view = new wp.media.view.AttachmentsBrowser({
-            controller: this,
-            collection: state.get('library'),
-            selection:  state.get('selection'),
-            model:      state,
-            sortable:   state.get('sortable'),
-            search:     state.get('searchable'),
-            filters:    state.get('filterable'),
-            date:       state.get('date'),
-            display:    state.has('display') ? state.get('display') : state.get('displaySettings'),
-            dragInfo:   state.get('dragInfo'),
-
-            idealColumnWidth: state.get('idealColumnWidth'),
-            suggestedWidth:   state.get('suggestedWidth'),
-            suggestedHeight:  state.get('suggestedHeight'),
-
-            AttachmentView: state.get('AttachmentView')
-        });
-    },
-
-    /**
-     * Render callback for the content region in the `upload` mode.
-     */
-    uploadContent: function() {
-        this.$el.removeClass( 'hide-toolbar' );
-        this.content.set( new wp.media.view.UploaderInline({
-            controller: this
-        }) );
-    },
-
-    /**
-     * Toolbars
-     *
-     * @param {Object} toolbar
-     * @param {Object} [options={}]
-     * @this wp.media.controller.Region
-     */
-    createSelectToolbar: function( toolbar, options ) {
-        options = options || this.options.button || {};
-        options.controller = this;
-
-        toolbar.view = new wp.media.view.Toolbar.Select( options );
-    }
-});
-
-module.exports = Select;
-
-},{}],47:[function(require,module,exports){
-/**
- * wp.media.view.Iframe
- *
- * @class
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var Iframe = wp.media.View.extend({
-    className: 'media-iframe',
-    /**
-     * @returns {wp.media.view.Iframe} Returns itself to allow chaining
-     */
-    render: function() {
-        this.views.detach();
-        this.$el.html( '<iframe src="' + this.controller.state().get('src') + '" />' );
-        this.views.render();
-        return this;
-    }
-});
-
-module.exports = Iframe;
-
-},{}],48:[function(require,module,exports){
+module.exports = EmbedImage;
+
+
+/***/ }),
+/* 95 */
+/***/ (function(module, exports) {
+
 /**
  * wp.media.view.ImageDetails
@@ -6174 +8574 @@
 module.exports = ImageDetails;
 
-},{}],49:[function(require,module,exports){
+
+/***/ }),
+/* 96 */
+/***/ (function(module, exports) {
+
 /**
- * wp.media.view.Label
- *
- * @class
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var Label = wp.media.View.extend({
-    tagName: 'label',
-    className: 'screen-reader-text',
-
-    initialize: function() {
-        this.value = this.options.value;
-    },
-
-    render: function() {
-        this.$el.html( this.value );
-
-        return this;
-    }
-});
-
-module.exports = Label;
-
-},{}],50:[function(require,module,exports){
-/**
- * wp.media.view.MediaFrame
- *
- * The frame used to create the media modal.
- *
- * @class
- * @augments wp.media.view.Frame
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- * @mixes wp.media.controller.StateMachine
- */
-var Frame = wp.media.view.Frame,
-    $ = jQuery,
-    MediaFrame;
-
-MediaFrame = Frame.extend({
-    className: 'media-frame',
-    template:  wp.template('media-frame'),
-    regions:   ['menu','title','content','toolbar','router'],
-
-    events: {
-        'click div.media-frame-title h1': 'toggleMenu'
-    },
-
-    /**
-     * @global wp.Uploader
-     */
-    initialize: function() {
-        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 wp.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 wp.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');
-
-        this.on( 'title:render', function( view ) {
-            view.$el.append( '<span class="dashicons dashicons-arrow-down"></span>' );
-        });
-
-        // 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 Frame.prototype.render.apply( this, arguments );
-    },
-    /**
-     * @param {Object} title
-     * @this wp.media.controller.Region
-     */
-    createTitle: function( title ) {
-        title.view = new wp.media.View({
-            controller: this,
-            tagName: 'h1'
-        });
-    },
-    /**
-     * @param {Object} menu
-     * @this wp.media.controller.Region
-     */
-    createMenu: function( menu ) {
-        menu.view = new wp.media.view.Menu({
-            controller: this
-        });
-    },
-
-    toggleMenu: function() {
-        this.$el.find( '.media-menu' ).toggleClass( 'visible' );
-    },
-
-    /**
-     * @param {Object} toolbar
-     * @this wp.media.controller.Region
-     */
-    createToolbar: function( toolbar ) {
-        toolbar.view = new wp.media.view.Toolbar({
-            controller: this
-        });
-    },
-    /**
-     * @param {Object} router
-     * @this wp.media.controller.Region
-     */
-    createRouter: function( router ) {
-        router.view = new wp.media.view.Router({
-            controller: this
-        });
-    },
-    /**
-     * @param {Object} options
-     */
-    createIframeStates: function( options ) {
-        var settings = wp.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( 'content:deactivate:iframe', this.iframeContentCleanup, 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 wp.media.view.Iframe({
-            controller: this
-        });
-    },
-
-    iframeContentCleanup: function() {
-        this.$el.removeClass('hide-toolbar');
-    },
-
-    iframeMenu: function( view ) {
-        var views = {};
-
-        if ( ! view ) {
-            return;
-        }
-
-        _.each( wp.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 some of the modal's methods to the frame.
-_.each(['open','close','attach','detach','escape'], function( method ) {
-    /**
-     * @returns {wp.media.view.MediaFrame} Returns itself to allow chaining
-     */
-    MediaFrame.prototype[ method ] = function() {
-        if ( this.modal ) {
-            this.modal[ method ].apply( this.modal, arguments );
-        }
-        return this;
-    };
-});
-
-module.exports = MediaFrame;
-
-},{}],51:[function(require,module,exports){
-/**
- * wp.media.view.MenuItem
- *
- * @class
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var $ = jQuery,
-    MenuItem;
-
-MenuItem = wp.media.View.extend({
-    tagName:   'a',
-    className: 'media-menu-item',
-
-    attributes: {
-        href: '#'
-    },
-
-    events: {
-        'click': '_click'
-    },
-    /**
-     * @param {Object} event
-     */
-    _click: function( event ) {
-        var clickOverride = this.options.click;
-
-        if ( event ) {
-            event.preventDefault();
-        }
-
-        if ( clickOverride ) {
-            clickOverride.call( this );
-        } else {
-            this.click();
-        }
-
-        // When selecting a tab along the left side,
-        // focus should be transferred into the main panel
-        if ( ! wp.media.isTouchDevice ) {
-            $('.media-frame-content input').first().focus();
-        }
-    },
-
-    click: function() {
-        var state = this.options.state;
-
-        if ( state ) {
-            this.controller.setState( state );
-            this.views.parent.$el.removeClass( 'visible' ); // TODO: or hide on any click, see below
-        }
-    },
-    /**
-     * @returns {wp.media.view.MenuItem} returns itself to allow chaining
-     */
-    render: function() {
-        var options = this.options;
-
-        if ( options.text ) {
-            this.$el.text( options.text );
-        } else if ( options.html ) {
-            this.$el.html( options.html );
-        }
-
-        return this;
-    }
-});
-
-module.exports = MenuItem;
-
-},{}],52:[function(require,module,exports){
-/**
- * wp.media.view.Menu
- *
- * @class
- * @augments wp.media.view.PriorityList
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var MenuItem = wp.media.view.MenuItem,
-    PriorityList = wp.media.view.PriorityList,
-    Menu;
-
-Menu = PriorityList.extend({
-    tagName:   'div',
-    className: 'media-menu',
-    property:  'state',
-    ItemView:  MenuItem,
-    region:    'menu',
-
-    /* TODO: alternatively hide on any click anywhere
-    events: {
-        'click': 'click'
-    },
-
-    click: function() {
-        this.$el.removeClass( 'visible' );
-    },
-    */
-
-    /**
-     * @param {Object} options
-     * @param {string} id
-     * @returns {wp.media.View}
-     */
-    toView: function( options, id ) {
-        options = options || {};
-        options[ this.property ] = options[ this.property ] || id;
-        return new this.ItemView( options ).render();
-    },
-
-    ready: function() {
-        /**
-         * call 'ready' directly on the parent class
-         */
-        PriorityList.prototype.ready.apply( this, arguments );
-        this.visibility();
-    },
-
-    set: function() {
-        /**
-         * call 'set' directly on the parent class
-         */
-        PriorityList.prototype.set.apply( this, arguments );
-        this.visibility();
-    },
-
-    unset: function() {
-        /**
-         * call 'unset' directly on the parent class
-         */
-        PriorityList.prototype.unset.apply( this, arguments );
-        this.visibility();
-    },
-
-    visibility: function() {
-        var region = this.region,
-            view = this.controller[ region ].get(),
-            views = this.views.get(),
-            hide = ! views || views.length < 2;
-
-        if ( this === view ) {
-            this.controller.$el.toggleClass( 'hide-' + region, hide );
-        }
-    },
-    /**
-     * @param {string} id
-     */
-    select: function( id ) {
-        var view = this.get( id );
-
-        if ( ! view ) {
-            return;
-        }
-
-        this.deselect();
-        view.$el.addClass('active');
-    },
-
-    deselect: function() {
-        this.$el.children().removeClass('active');
-    },
-
-    hide: function( id ) {
-        var view = this.get( id );
-
-        if ( ! view ) {
-            return;
-        }
-
-        view.$el.addClass('hidden');
-    },
-
-    show: function( id ) {
-        var view = this.get( id );
-
-        if ( ! view ) {
-            return;
-        }
-
-        view.$el.removeClass('hidden');
-    }
-});
-
-module.exports = Menu;
-
-},{}],53:[function(require,module,exports){
-/**
- * wp.media.view.Modal
- *
- * A modal view, which the media modal uses as its default container.
- *
- * @class
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var $ = jQuery,
-    Modal;
-
-Modal = wp.media.View.extend({
-    tagName:  'div',
-    template: wp.template('media-modal'),
-
-    attributes: {
-        tabindex: 0
-    },
-
-    events: {
-        'click .media-modal-backdrop, .media-modal-close': 'escapeHandler',
-        'keydown': 'keydown'
-    },
-
-    initialize: function() {
-        _.defaults( this.options, {
-            container: document.body,
-            title:     '',
-            propagate: true,
-            freeze:    true
-        });
-
-        this.focusManager = new wp.media.view.FocusManager({
-            el: this.el
-        });
-    },
-    /**
-     * @returns {Object}
-     */
-    prepare: function() {
-        return {
-            title: this.options.title
-        };
-    },
-
-    /**
-     * @returns {wp.media.view.Modal} Returns itself to allow chaining
-     */
-    attach: function() {
-        if ( this.views.attached ) {
-            return this;
-        }
-
-        if ( ! this.views.rendered ) {
-            this.render();
-        }
-
-        this.$el.appendTo( this.options.container );
-
-        // Manually mark the view as attached and trigger ready.
-        this.views.attached = true;
-        this.views.ready();
-
-        return this.propagate('attach');
-    },
-
-    /**
-     * @returns {wp.media.view.Modal} Returns itself to allow chaining
-     */
-    detach: function() {
-        if ( this.$el.is(':visible') ) {
-            this.close();
-        }
-
-        this.$el.detach();
-        this.views.attached = false;
-        return this.propagate('detach');
-    },
-
-    /**
-     * @returns {wp.media.view.Modal} Returns itself to allow chaining
-     */
-    open: function() {
-        var $el = this.$el,
-            options = this.options,
-            mceEditor;
-
-        if ( $el.is(':visible') ) {
-            return this;
-        }
-
-        if ( ! this.views.attached ) {
-            this.attach();
-        }
-
-        // If the `freeze` option is set, record the window's scroll position.
-        if ( options.freeze ) {
-            this._freeze = {
-                scrollTop: $( window ).scrollTop()
-            };
-        }
-
-        // Disable page scrolling.
-        $( 'body' ).addClass( 'modal-open' );
-
-        $el.show();
-
-        // Try to close the onscreen keyboard
-        if ( 'ontouchend' in document ) {
-            if ( ( mceEditor = window.tinymce && window.tinymce.activeEditor )  && ! mceEditor.isHidden() && mceEditor.iframeElement ) {
-                mceEditor.iframeElement.focus();
-                mceEditor.iframeElement.blur();
-
-                setTimeout( function() {
-                    mceEditor.iframeElement.blur();
-                }, 100 );
-            }
-        }
-
-        this.$el.focus();
-
-        return this.propagate('open');
-    },
-
-    /**
-     * @param {Object} options
-     * @returns {wp.media.view.Modal} Returns itself to allow chaining
-     */
-    close: function( options ) {
-        var freeze = this._freeze;
-
-        if ( ! this.views.attached || ! this.$el.is(':visible') ) {
-            return this;
-        }
-
-        // Enable page scrolling.
-        $( 'body' ).removeClass( 'modal-open' );
-
-        // Hide modal and remove restricted media modal tab focus once it's closed
-        this.$el.hide().undelegate( 'keydown' );
-
-        // Put focus back in useful location once modal is closed
-        $('#wpbody-content').focus();
-
-        this.propagate('close');
-
-        // If the `freeze` option is set, restore the container's scroll position.
-        if ( freeze ) {
-            $( window ).scrollTop( freeze.scrollTop );
-        }
-
-        if ( options && options.escape ) {
-            this.propagate('escape');
-        }
-
-        return this;
-    },
-    /**
-     * @returns {wp.media.view.Modal} Returns itself to allow chaining
-     */
-    escape: function() {
-        return this.close({ escape: true });
-    },
-    /**
-     * @param {Object} event
-     */
-    escapeHandler: function( event ) {
-        event.preventDefault();
-        this.escape();
-    },
-
-    /**
-     * @param {Array|Object} content Views to register to '.media-modal-content'
-     * @returns {wp.media.view.Modal} Returns itself to allow chaining
-     */
-    content: function( content ) {
-        this.views.set( '.media-modal-content', content );
-        return this;
-    },
-
-    /**
-     * Triggers a modal event and if the `propagate` option is set,
-     * forwards events to the modal's controller.
-     *
-     * @param {string} id
-     * @returns {wp.media.view.Modal} Returns itself to allow chaining
-     */
-    propagate: function( id ) {
-        this.trigger( id );
-
-        if ( this.options.propagate ) {
-            this.controller.trigger( id );
-        }
-
-        return this;
-    },
-    /**
-     * @param {Object} event
-     */
-    keydown: function( event ) {
-        // Close the modal when escape is pressed.
-        if ( 27 === event.which && this.$el.is(':visible') ) {
-            this.escape();
-            event.stopImmediatePropagation();
-        }
-    }
-});
-
-module.exports = Modal;
-
-},{}],54:[function(require,module,exports){
-/**
- * wp.media.view.PriorityList
- *
- * @class
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var PriorityList = wp.media.View.extend({
-    tagName:   'div',
-
-    initialize: function() {
-        this._views = {};
-
-        this.set( _.extend( {}, this._views, this.options.views ), { silent: true });
-        delete this.options.views;
-
-        if ( ! this.options.silent ) {
-            this.render();
-        }
-    },
-    /**
-     * @param {string} id
-     * @param {wp.media.View|Object} view
-     * @param {Object} options
-     * @returns {wp.media.view.PriorityList} Returns itself to allow chaining
-     */
-    set: function( id, view, options ) {
-        var priority, views, index;
-
-        options = options || {};
-
-        // Accept an object with an `id` : `view` mapping.
-        if ( _.isObject( id ) ) {
-            _.each( id, function( view, id ) {
-                this.set( id, view );
-            }, this );
-            return this;
-        }
-
-        if ( ! (view instanceof Backbone.View) ) {
-            view = this.toView( view, id, options );
-        }
-        view.controller = view.controller || this.controller;
-
-        this.unset( id );
-
-        priority = view.options.priority || 10;
-        views = this.views.get() || [];
-
-        _.find( views, function( existing, i ) {
-            if ( existing.options.priority > priority ) {
-                index = i;
-                return true;
-            }
-        });
-
-        this._views[ id ] = view;
-        this.views.add( view, {
-            at: _.isNumber( index ) ? index : views.length || 0
-        });
-
-        return this;
-    },
-    /**
-     * @param {string} id
-     * @returns {wp.media.View}
-     */
-    get: function( id ) {
-        return this._views[ id ];
-    },
-    /**
-     * @param {string} id
-     * @returns {wp.media.view.PriorityList}
-     */
-    unset: function( id ) {
-        var view = this.get( id );
-
-        if ( view ) {
-            view.remove();
-        }
-
-        delete this._views[ id ];
-        return this;
-    },
-    /**
-     * @param {Object} options
-     * @returns {wp.media.View}
-     */
-    toView: function( options ) {
-        return new wp.media.View( options );
-    }
-});
-
-module.exports = PriorityList;
-
-},{}],55:[function(require,module,exports){
-/**
- * wp.media.view.RouterItem
- *
- * @class
- * @augments wp.media.view.MenuItem
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var RouterItem = wp.media.view.MenuItem.extend({
-    /**
-     * On click handler to activate the content region's corresponding mode.
-     */
-    click: function() {
-        var contentMode = this.options.contentMode;
-        if ( contentMode ) {
-            this.controller.content.mode( contentMode );
-        }
-    }
-});
-
-module.exports = RouterItem;
-
-},{}],56:[function(require,module,exports){
-/**
- * wp.media.view.Router
- *
- * @class
- * @augments wp.media.view.Menu
- * @augments wp.media.view.PriorityList
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var Menu = wp.media.view.Menu,
-    Router;
-
-Router = Menu.extend({
-    tagName:   'div',
-    className: 'media-router',
-    property:  'contentMode',
-    ItemView:  wp.media.view.RouterItem,
-    region:    'router',
-
-    initialize: function() {
-        this.controller.on( 'content:render', this.update, this );
-        // Call 'initialize' directly on the parent class.
-        Menu.prototype.initialize.apply( this, arguments );
-    },
-
-    update: function() {
-        var mode = this.controller.content.mode();
-        if ( mode ) {
-            this.select( mode );
-        }
-    }
-});
-
-module.exports = Router;
-
-},{}],57:[function(require,module,exports){
-/**
- * wp.media.view.Search
- *
- * @class
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var l10n = wp.media.view.l10n,
-    Search;
-
-Search = wp.media.View.extend({
-    tagName:   'input',
-    className: 'search',
-    id:        'media-search-input',
-
-    attributes: {
-        type:        'search',
-        placeholder: l10n.search
-    },
-
-    events: {
-        'input':  'search',
-        'keyup':  'search',
-        'change': 'search',
-        'search': 'search'
-    },
-
-    /**
-     * @returns {wp.media.view.Search} Returns itself to allow chaining
-     */
-    render: function() {
-        this.el.value = this.model.escape('search');
-        return this;
-    },
-
-    search: function( event ) {
-        if ( event.target.value ) {
-            this.model.set( 'search', event.target.value );
-        } else {
-            this.model.unset('search');
-        }
-    }
-});
-
-module.exports = Search;
-
-},{}],58:[function(require,module,exports){
-/**
- * wp.media.view.Selection
- *
- * @class
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var l10n = wp.media.view.l10n,
-    Selection;
-
-Selection = wp.media.View.extend({
-    tagName:   'div',
-    className: 'media-selection',
-    template:  wp.template('media-selection'),
-
-    events: {
-        'click .edit-selection':  'edit',
-        'click .clear-selection': 'clear'
-    },
-
-    initialize: function() {
-        _.defaults( this.options, {
-            editable:  false,
-            clearable: true
-        });
-
-        /**
-         * @member {wp.media.view.Attachments.Selection}
-         */
-        this.attachments = new wp.media.view.Attachments.Selection({
-            controller: this.controller,
-            collection: this.collection,
-            selection:  this.collection,
-            model:      new Backbone.Model()
-        });
-
-        this.views.set( '.selection-view', this.attachments );
-        this.collection.on( 'add remove reset', this.refresh, this );
-        this.controller.on( 'content:activate', this.refresh, this );
-    },
-
-    ready: function() {
-        this.refresh();
-    },
-
-    refresh: function() {
-        // If the selection hasn't been rendered, bail.
-        if ( ! this.$el.children().length ) {
-            return;
-        }
-
-        var collection = this.collection,
-            editing = 'edit-selection' === this.controller.content.mode();
-
-        // If nothing is selected, display nothing.
-        this.$el.toggleClass( 'empty', ! collection.length );
-        this.$el.toggleClass( 'one', 1 === collection.length );
-        this.$el.toggleClass( 'editing', editing );
-
-        this.$('.count').text( l10n.selected.replace('%d', collection.length) );
-    },
-
-    edit: function( event ) {
-        event.preventDefault();
-        if ( this.options.editable ) {
-            this.options.editable.call( this, this.collection );
-        }
-    },
-
-    clear: function( event ) {
-        event.preventDefault();
-        this.collection.reset();
-
-        // Keep focus inside media modal
-        // after clear link is selected
-        this.controller.modal.focusManager.focus();
-    }
-});
-
-module.exports = Selection;
-
-},{}],59:[function(require,module,exports){
-/**
- * wp.media.view.Settings
+ * wp.media.view.Cropper
+ *
+ * Uses the imgAreaSelect plugin to allow a user to crop an image.
+ *
+ * Takes imgAreaSelect options from
+ * wp.customize.HeaderControl.calculateImageSelectOptions via
+ * wp.customize.HeaderControl.openMM.
  *
  * @class
@@ -7148 +8594 @@
  */
 var View = wp.media.View,
-    $ = Backbone.$,
-    Settings;
-
-Settings = View.extend({
-    events: {
-        'click button':    'updateHandler',
-        'change input':    'updateHandler',
-        'change select':   'updateHandler',
-        'change textarea': 'updateHandler'
-    },
-
+    UploaderStatus = wp.media.view.UploaderStatus,
+    l10n = wp.media.view.l10n,
+    $ = jQuery,
+    Cropper;
+
+Cropper = View.extend({
+    className: 'crop-content',
+    template: wp.template('crop-content'),
     initialize: function() {
-        this.model = this.model || new Backbone.Model();
-        this.listenTo( this.model, 'change', this.updateChanges );
-    },
-
+        _.bindAll(this, 'onImageLoad');
+    },
+    ready: function() {
+        this.controller.frame.on('content:error:crop', this.onError, this);
+        this.$image = this.$el.find('.crop-image');
+        this.$image.on('load', this.onImageLoad);
+        $(window).on('resize.cropper', _.debounce(this.onImageLoad, 250));
+    },
+    remove: function() {
+        $(window).off('resize.cropper');
+        this.$el.remove();
+        this.$el.off();
+        View.prototype.remove.apply(this, arguments);
+    },
     prepare: function() {
-        return _.defaults({
-            model: this.model.toJSON()
-        }, this.options );
-    },
-    /**
-     * @returns {wp.media.view.Settings} Returns itself to allow chaining
-     */
-    render: function() {
-        View.prototype.render.apply( this, arguments );
-        // Select the correct values.
-        _( this.model.attributes ).chain().keys().each( this.update, this );
-        return this;
-    },
-    /**
-     * @param {string} key
-     */
-    update: function( key ) {
-        var value = this.model.get( key ),
-            $setting = this.$('[data-setting="' + key + '"]'),
-            $buttons, $value;
-
-        // Bail if we didn't find a matching setting.
-        if ( ! $setting.length ) {
-            return;
-        }
-
-        // Attempt to determine how the setting is rendered and update
-        // the selected value.
-
-        // Handle dropdowns.
-        if ( $setting.is('select') ) {
-            $value = $setting.find('[value="' + value + '"]');
-
-            if ( $value.length ) {
-                $setting.find('option').prop( 'selected', false );
-                $value.prop( 'selected', true );
-            } else {
-                // If we can't find the desired value, record what *is* selected.
-                this.model.set( key, $setting.find(':selected').val() );
-            }
-
-        // Handle button groups.
-        } else if ( $setting.hasClass('button-group') ) {
-            $buttons = $setting.find('button').removeClass('active');
-            $buttons.filter( '[value="' + value + '"]' ).addClass('active');
-
-        // Handle text inputs and textareas.
-        } else if ( $setting.is('input[type="text"], textarea') ) {
-            if ( ! $setting.is(':focus') ) {
-                $setting.val( value );
-            }
-        // Handle checkboxes.
-        } else if ( $setting.is('input[type="checkbox"]') ) {
-            $setting.prop( 'checked', !! value && 'false' !== value );
-        }
-    },
-    /**
-     * @param {Object} event
-     */
-    updateHandler: function( event ) {
-        var $setting = $( event.target ).closest('[data-setting]'),
-            value = event.target.value,
-            userSetting;
-
-        event.preventDefault();
-
-        if ( ! $setting.length ) {
-            return;
-        }
-
-        // Use the correct value for checkboxes.
-        if ( $setting.is('input[type="checkbox"]') ) {
-            value = $setting[0].checked;
-        }
-
-        // Update the corresponding setting.
-        this.model.set( $setting.data('setting'), value );
-
-        // If the setting has a corresponding user setting,
-        // update that as well.
-        if ( userSetting = $setting.data('userSetting') ) {
-            window.setUserSetting( userSetting, value );
-        }
-    },
-
-    updateChanges: function( model ) {
-        if ( model.hasChanged() ) {
-            _( model.changed ).chain().keys().each( this.update, this );
-        }
+        return {
+            title: l10n.cropYourImage,
+            url: this.options.attachment.get('url')
+        };
+    },
+    onImageLoad: function() {
+        var imgOptions = this.controller.get('imgSelectOptions');
+        if (typeof imgOptions === 'function') {
+            imgOptions = imgOptions(this.options.attachment, this.controller);
+        }
+
+        imgOptions = _.extend(imgOptions, {parent: this.$el});
+        this.trigger('image-loaded');
+        this.controller.imgSelect = this.$image.imgAreaSelect(imgOptions);
+    },
+    onError: function() {
+        var filename = this.options.attachment.get('filename');
+
+        this.views.add( '.upload-errors', new wp.media.view.UploaderStatusError({
+            filename: UploaderStatus.prototype.filename(filename),
+            message: window._wpMediaViewsL10n.cropError
+        }), { at: 0 });
     }
 });
 
-module.exports = Settings;
-
-},{}],60:[function(require,module,exports){
-/**
- * wp.media.view.Settings.AttachmentDisplay
- *
- * @class
- * @augments wp.media.view.Settings
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var Settings = wp.media.view.Settings,
-    AttachmentDisplay;
-
-AttachmentDisplay = Settings.extend({
-    className: 'attachment-display-settings',
-    template:  wp.template('attachment-display-settings'),
-
-    initialize: function() {
-        var attachment = this.options.attachment;
-
-        _.defaults( this.options, {
-            userSettings: false
-        });
-        // Call 'initialize' directly on the parent class.
-        Settings.prototype.initialize.apply( this, arguments );
-        this.listenTo( this.model, 'change:link', this.updateLinkTo );
-
-        if ( attachment ) {
-            attachment.on( 'change:uploading', this.render, this );
-        }
-    },
-
-    dispose: function() {
-        var attachment = this.options.attachment;
-        if ( attachment ) {
-            attachment.off( null, null, this );
-        }
-        /**
-         * call 'dispose' directly on the parent class
-         */
-        Settings.prototype.dispose.apply( this, arguments );
-    },
-    /**
-     * @returns {wp.media.view.AttachmentDisplay} Returns itself to allow chaining
-     */
-    render: function() {
-        var attachment = this.options.attachment;
-        if ( attachment ) {
-            _.extend( this.options, {
-                sizes: attachment.get('sizes'),
-                type:  attachment.get('type')
-            });
-        }
-        /**
-         * call 'render' directly on the parent class
-         */
-        Settings.prototype.render.call( this );
-        this.updateLinkTo();
-        return this;
-    },
-
-    updateLinkTo: function() {
-        var linkTo = this.model.get('link'),
-            $input = this.$('.link-to-custom'),
-            attachment = this.options.attachment;
-
-        if ( 'none' === linkTo || 'embed' === linkTo || ( ! attachment && 'custom' !== linkTo ) ) {
-            $input.addClass( 'hidden' );
-            return;
-        }
-
-        if ( attachment ) {
-            if ( 'post' === linkTo ) {
-                $input.val( attachment.get('link') );
-            } else if ( 'file' === linkTo ) {
-                $input.val( attachment.get('url') );
-            } else if ( ! this.model.get('linkUrl') ) {
-                $input.val('http://');
-            }
-
-            $input.prop( 'readonly', 'custom' !== linkTo );
-        }
-
-        $input.removeClass( 'hidden' );
-
-        // If the input is visible, focus and select its contents.
-        if ( ! wp.media.isTouchDevice && $input.is(':visible') ) {
-            $input.focus()[0].select();
-        }
-    }
-});
-
-module.exports = AttachmentDisplay;
-
-},{}],61:[function(require,module,exports){
-/**
- * wp.media.view.Settings.Gallery
- *
- * @class
- * @augments wp.media.view.Settings
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var Gallery = wp.media.view.Settings.extend({
-    className: 'collection-settings gallery-settings',
-    template:  wp.template('gallery-settings')
-});
-
-module.exports = Gallery;
-
-},{}],62:[function(require,module,exports){
-/**
- * wp.media.view.Settings.Playlist
- *
- * @class
- * @augments wp.media.view.Settings
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var Playlist = wp.media.view.Settings.extend({
-    className: 'collection-settings playlist-settings',
-    template:  wp.template('playlist-settings')
-});
-
-module.exports = Playlist;
-
-},{}],63:[function(require,module,exports){
-/**
- * wp.media.view.Sidebar
- *
- * @class
- * @augments wp.media.view.PriorityList
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var Sidebar = wp.media.view.PriorityList.extend({
-    className: 'media-sidebar'
-});
-
-module.exports = Sidebar;
-
-},{}],64:[function(require,module,exports){
+module.exports = Cropper;
+
+
+/***/ }),
+/* 97 */
+/***/ (function(module, exports) {
+
 /**
  * wp.media.view.SiteIconCropper
@@ -7446 +8692 @@
 module.exports = SiteIconCropper;
 
-},{}],65:[function(require,module,exports){
+
+/***/ }),
+/* 98 */
+/***/ (function(module, exports) {
+
 /**
  * wp.media.view.SiteIconPreview
@@ -7502 +8752 @@
 module.exports = SiteIconPreview;
 
-},{}],66:[function(require,module,exports){
+
+/***/ }),
+/* 99 */
+/***/ (function(module, exports) {
+
+/**
+ * wp.media.view.EditImage
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var View = wp.media.View,
+    EditImage;
+
+EditImage = View.extend({
+    className: 'image-editor',
+    template: wp.template('image-editor'),
+
+    initialize: function( options ) {
+        this.editor = window.imageEdit;
+        this.controller = options.controller;
+        View.prototype.initialize.apply( this, arguments );
+    },
+
+    prepare: function() {
+        return this.model.toJSON();
+    },
+
+    loadEditor: function() {
+        var dfd = this.editor.open( this.model.get('id'), this.model.get('nonces').edit, this );
+        dfd.done( _.bind( this.focus, this ) );
+    },
+
+    focus: function() {
+        this.$( '.imgedit-submit .button' ).eq( 0 ).focus();
+    },
+
+    back: function() {
+        var lastState = this.controller.lastState();
+        this.controller.setState( lastState );
+    },
+
+    refresh: function() {
+        this.model.fetch();
+    },
+
+    save: function() {
+        var lastState = this.controller.lastState();
+
+        this.model.fetch().done( _.bind( function() {
+            this.controller.setState( lastState );
+        }, this ) );
+    }
+
+});
+
+module.exports = EditImage;
+
+
+/***/ }),
+/* 100 */
+/***/ (function(module, exports) {
+
 /**
  * wp.media.view.Spinner
@@ -7537 +8851 @@
 module.exports = Spinner;
 
-},{}],67:[function(require,module,exports){
-/**
- * wp.media.view.Toolbar
- *
- * A toolbar which consists of a primary and a secondary section. Each sections
- * can be filled with views.
- *
- * @class
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var View = wp.media.View,
-    Toolbar;
-
-Toolbar = View.extend({
-    tagName:   'div',
-    className: 'media-toolbar',
-
-    initialize: function() {
-        var state = this.controller.state(),
-            selection = this.selection = state.get('selection'),
-            library = this.library = state.get('library');
-
-        this._views = {};
-
-        // The toolbar is composed of two `PriorityList` views.
-        this.primary   = new wp.media.view.PriorityList();
-        this.secondary = new wp.media.view.PriorityList();
-        this.primary.$el.addClass('media-toolbar-primary search-form');
-        this.secondary.$el.addClass('media-toolbar-secondary');
-
-        this.views.set([ this.secondary, this.primary ]);
-
-        if ( this.options.items ) {
-            this.set( this.options.items, { silent: true });
-        }
-
-        if ( ! this.options.silent ) {
-            this.render();
-        }
-
-        if ( selection ) {
-            selection.on( 'add remove reset', this.refresh, this );
-        }
-
-        if ( library ) {
-            library.on( 'add remove reset', this.refresh, this );
-        }
-    },
-    /**
-     * @returns {wp.media.view.Toolbar} Returns itsef to allow chaining
-     */
-    dispose: function() {
-        if ( this.selection ) {
-            this.selection.off( null, null, this );
-        }
-
-        if ( this.library ) {
-            this.library.off( null, null, this );
-        }
-        /**
-         * call 'dispose' directly on the parent class
-         */
-        return View.prototype.dispose.apply( this, arguments );
-    },
-
-    ready: function() {
-        this.refresh();
-    },
-
-    /**
-     * @param {string} id
-     * @param {Backbone.View|Object} view
-     * @param {Object} [options={}]
-     * @returns {wp.media.view.Toolbar} Returns itself to allow chaining
-     */
-    set: function( id, view, options ) {
-        var list;
-        options = options || {};
-
-        // Accept an object with an `id` : `view` mapping.
-        if ( _.isObject( id ) ) {
-            _.each( id, function( view, id ) {
-                this.set( id, view, { silent: true });
-            }, this );
-
-        } else {
-            if ( ! ( view instanceof Backbone.View ) ) {
-                view.classes = [ 'media-button-' + id ].concat( view.classes || [] );
-                view = new wp.media.view.Button( view ).render();
-            }
-
-            view.controller = view.controller || this.controller;
-
-            this._views[ id ] = view;
-
-            list = view.options.priority < 0 ? 'secondary' : 'primary';
-            this[ list ].set( id, view, options );
-        }
-
-        if ( ! options.silent ) {
-            this.refresh();
-        }
-
-        return this;
-    },
-    /**
-     * @param {string} id
-     * @returns {wp.media.view.Button}
-     */
-    get: function( id ) {
-        return this._views[ id ];
-    },
-    /**
-     * @param {string} id
-     * @param {Object} options
-     * @returns {wp.media.view.Toolbar} Returns itself to allow chaining
-     */
-    unset: function( id, options ) {
-        delete this._views[ id ];
-        this.primary.unset( id, options );
-        this.secondary.unset( id, options );
-
-        if ( ! options || ! options.silent ) {
-            this.refresh();
-        }
-        return this;
-    },
-
-    refresh: function() {
-        var state = this.controller.state(),
-            library = state.get('library'),
-            selection = state.get('selection');
-
-        _.each( this._views, function( button ) {
-            if ( ! button.model || ! button.options || ! button.options.requires ) {
-                return;
-            }
-
-            var requires = button.options.requires,
-                disabled = false;
-
-            // Prevent insertion of attachments if any of them are still uploading
-            disabled = _.some( selection.models, function( attachment ) {
-                return attachment.get('uploading') === true;
-            });
-
-            if ( requires.selection && selection && ! selection.length ) {
-                disabled = true;
-            } else if ( requires.library && library && ! library.length ) {
-                disabled = true;
-            }
-            button.model.set( 'disabled', disabled );
-        });
-    }
-});
-
-module.exports = Toolbar;
-
-},{}],68:[function(require,module,exports){
-/**
- * wp.media.view.Toolbar.Embed
- *
- * @class
- * @augments wp.media.view.Toolbar.Select
- * @augments wp.media.view.Toolbar
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var Select = wp.media.view.Toolbar.Select,
-    l10n = wp.media.view.l10n,
-    Embed;
-
-Embed = Select.extend({
-    initialize: function() {
-        _.defaults( this.options, {
-            text: l10n.insertIntoPost,
-            requires: false
-        });
-        // Call 'initialize' directly on the parent class.
-        Select.prototype.initialize.apply( this, arguments );
-    },
-
-    refresh: function() {
-        var url = this.controller.state().props.get('url');
-        this.get('select').model.set( 'disabled', ! url || url === 'http://' );
-        /**
-         * call 'refresh' directly on the parent class
-         */
-        Select.prototype.refresh.apply( this, arguments );
-    }
-});
-
-module.exports = Embed;
-
-},{}],69:[function(require,module,exports){
-/**
- * wp.media.view.Toolbar.Select
- *
- * @class
- * @augments wp.media.view.Toolbar
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var Toolbar = wp.media.view.Toolbar,
-    l10n = wp.media.view.l10n,
-    Select;
-
-Select = Toolbar.extend({
-    initialize: function() {
-        var options = this.options;
-
-        _.bindAll( this, 'clickSelect' );
-
-        _.defaults( options, {
-            event: 'select',
-            state: false,
-            reset: true,
-            close: true,
-            text:  l10n.select,
-
-            // Does the button rely on the selection?
-            requires: {
-                selection: true
-            }
-        });
-
-        options.items = _.defaults( options.items || {}, {
-            select: {
-                style:    'primary',
-                text:     options.text,
-                priority: 80,
-                click:    this.clickSelect,
-                requires: options.requires
-            }
-        });
-        // Call 'initialize' directly on the parent class.
-        Toolbar.prototype.initialize.apply( this, arguments );
-    },
-
-    clickSelect: function() {
-        var options = this.options,
-            controller = this.controller;
-
-        if ( options.close ) {
-            controller.close();
-        }
-
-        if ( options.event ) {
-            controller.state().trigger( options.event );
-        }
-
-        if ( options.state ) {
-            controller.setState( options.state );
-        }
-
-        if ( options.reset ) {
-            controller.reset();
-        }
-    }
-});
-
-module.exports = Select;
-
-},{}],70:[function(require,module,exports){
-/**
- * Creates a dropzone on WP editor instances (elements with .wp-editor-wrap)
- * and relays drag'n'dropped files to a media workflow.
- *
- * wp.media.view.EditorUploader
- *
- * @class
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var View = wp.media.View,
-    l10n = wp.media.view.l10n,
-    $ = jQuery,
-    EditorUploader;
-
-EditorUploader = View.extend({
-    tagName:   'div',
-    className: 'uploader-editor',
-    template:  wp.template( 'uploader-editor' ),
-
-    localDrag: false,
-    overContainer: false,
-    overDropzone: false,
-    draggingFile: null,
-
-    /**
-     * Bind drag'n'drop events to callbacks.
-     */
-    initialize: function() {
-        this.initialized = false;
-
-        // Bail if not enabled or UA does not support drag'n'drop or File API.
-        if ( ! window.tinyMCEPreInit || ! window.tinyMCEPreInit.dragDropUpload || ! this.browserSupport() ) {
-            return this;
-        }
-
-        this.$document = $(document);
-        this.dropzones = [];
-        this.files = [];
-
-        this.$document.on( 'drop', '.uploader-editor', _.bind( this.drop, this ) );
-        this.$document.on( 'dragover', '.uploader-editor', _.bind( this.dropzoneDragover, this ) );
-        this.$document.on( 'dragleave', '.uploader-editor', _.bind( this.dropzoneDragleave, this ) );
-        this.$document.on( 'click', '.uploader-editor', _.bind( this.click, this ) );
-
-        this.$document.on( 'dragover', _.bind( this.containerDragover, this ) );
-        this.$document.on( 'dragleave', _.bind( this.containerDragleave, this ) );
-
-        this.$document.on( 'dragstart dragend drop', _.bind( function( event ) {
-            this.localDrag = event.type === 'dragstart';
-        }, this ) );
-
-        this.initialized = true;
-        return this;
-    },
-
-    /**
-     * Check browser support for drag'n'drop.
-     *
-     * @return Boolean
-     */
-    browserSupport: function() {
-        var supports = false, div = document.createElement('div');
-
-        supports = ( 'draggable' in div ) || ( 'ondragstart' in div && 'ondrop' in div );
-        supports = supports && !! ( window.File && window.FileList && window.FileReader );
-        return supports;
-    },
-
-    isDraggingFile: function( event ) {
-        if ( this.draggingFile !== null ) {
-            return this.draggingFile;
-        }
-
-        if ( _.isUndefined( event.originalEvent ) || _.isUndefined( event.originalEvent.dataTransfer ) ) {
-            return false;
-        }
-
-        this.draggingFile = _.indexOf( event.originalEvent.dataTransfer.types, 'Files' ) > -1 &&
-            _.indexOf( event.originalEvent.dataTransfer.types, 'text/plain' ) === -1;
-
-        return this.draggingFile;
-    },
-
-    refresh: function( e ) {
-        var dropzone_id;
-        for ( dropzone_id in this.dropzones ) {
-            // Hide the dropzones only if dragging has left the screen.
-            this.dropzones[ dropzone_id ].toggle( this.overContainer || this.overDropzone );
-        }
-
-        if ( ! _.isUndefined( e ) ) {
-            $( e.target ).closest( '.uploader-editor' ).toggleClass( 'droppable', this.overDropzone );
-        }
-
-        if ( ! this.overContainer && ! this.overDropzone ) {
-            this.draggingFile = null;
-        }
-
-        return this;
-    },
-
-    render: function() {
-        if ( ! this.initialized ) {
-            return this;
-        }
-
-        View.prototype.render.apply( this, arguments );
-        $( '.wp-editor-wrap' ).each( _.bind( this.attach, this ) );
-        return this;
-    },
-
-    attach: function( index, editor ) {
-        // Attach a dropzone to an editor.
-        var dropzone = this.$el.clone();
-        this.dropzones.push( dropzone );
-        $( editor ).append( dropzone );
-        return this;
-    },
-
-    /**
-     * When a file is dropped on the editor uploader, open up an editor media workflow
-     * and upload the file immediately.
-     *
-     * @param  {jQuery.Event} event The 'drop' event.
-     */
-    drop: function( event ) {
-        var $wrap, uploadView;
-
-        this.containerDragleave( event );
-        this.dropzoneDragleave( event );
-
-        this.files = event.originalEvent.dataTransfer.files;
-        if ( this.files.length < 1 ) {
-            return;
-        }
-
-        // Set the active editor to the drop target.
-        $wrap = $( event.target ).parents( '.wp-editor-wrap' );
-        if ( $wrap.length > 0 && $wrap[0].id ) {
-            window.wpActiveEditor = $wrap[0].id.slice( 3, -5 );
-        }
-
-        if ( ! this.workflow ) {
-            this.workflow = wp.media.editor.open( window.wpActiveEditor, {
-                frame:    'post',
-                state:    'insert',
-                title:    l10n.addMedia,
-                multiple: true
-            });
-
-            uploadView = this.workflow.uploader;
-
-            if ( uploadView.uploader && uploadView.uploader.ready ) {
-                this.addFiles.apply( this );
-            } else {
-                this.workflow.on( 'uploader:ready', this.addFiles, this );
-            }
-        } else {
-            this.workflow.state().reset();
-            this.addFiles.apply( this );
-            this.workflow.open();
-        }
-
-        return false;
-    },
-
-    /**
-     * Add the files to the uploader.
-     */
-    addFiles: function() {
-        if ( this.files.length ) {
-            this.workflow.uploader.uploader.uploader.addFile( _.toArray( this.files ) );
-            this.files = [];
-        }
-        return this;
-    },
-
-    containerDragover: function( event ) {
-        if ( this.localDrag || ! this.isDraggingFile( event ) ) {
-            return;
-        }
-
-        this.overContainer = true;
-        this.refresh();
-    },
-
-    containerDragleave: function() {
-        this.overContainer = false;
-
-        // Throttle dragleave because it's called when bouncing from some elements to others.
-        _.delay( _.bind( this.refresh, this ), 50 );
-    },
-
-    dropzoneDragover: function( event ) {
-        if ( this.localDrag || ! this.isDraggingFile( event ) ) {
-            return;
-        }
-
-        this.overDropzone = true;
-        this.refresh( event );
-        return false;
-    },
-
-    dropzoneDragleave: function( e ) {
-        this.overDropzone = false;
-        _.delay( _.bind( this.refresh, this, e ), 50 );
-    },
-
-    click: function( e ) {
-        // In the rare case where the dropzone gets stuck, hide it on click.
-        this.containerDragleave( e );
-        this.dropzoneDragleave( e );
-        this.localDrag = false;
-    }
-});
-
-module.exports = EditorUploader;
-
-},{}],71:[function(require,module,exports){
-/**
- * wp.media.view.UploaderInline
- *
- * The inline uploader that shows up in the 'Upload Files' tab.
- *
- * @class
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var View = wp.media.View,
-    UploaderInline;
-
-UploaderInline = View.extend({
-    tagName:   'div',
-    className: 'uploader-inline',
-    template:  wp.template('uploader-inline'),
-
-    events: {
-        'click .close': 'hide'
-    },
-
-    initialize: function() {
-        _.defaults( this.options, {
-            message: '',
-            status:  true,
-            canClose: false
-        });
-
-        if ( ! this.options.$browser && this.controller.uploader ) {
-            this.options.$browser = this.controller.uploader.$browser;
-        }
-
-        if ( _.isUndefined( this.options.postId ) ) {
-            this.options.postId = wp.media.view.settings.post.id;
-        }
-
-        if ( this.options.status ) {
-            this.views.set( '.upload-inline-status', new wp.media.view.UploaderStatus({
-                controller: this.controller
-            }) );
-        }
-    },
-
-    prepare: function() {
-        var suggestedWidth = this.controller.state().get('suggestedWidth'),
-            suggestedHeight = this.controller.state().get('suggestedHeight'),
-            data = {};
-
-        data.message = this.options.message;
-        data.canClose = this.options.canClose;
-
-        if ( suggestedWidth && suggestedHeight ) {
-            data.suggestedWidth = suggestedWidth;
-            data.suggestedHeight = suggestedHeight;
-        }
-
-        return data;
-    },
-    /**
-     * @returns {wp.media.view.UploaderInline} Returns itself to allow chaining
-     */
-    dispose: function() {
-        if ( this.disposing ) {
-            /**
-             * call 'dispose' directly on the parent class
-             */
-            return View.prototype.dispose.apply( this, arguments );
-        }
-
-        // Run remove on `dispose`, so we can be sure to refresh the
-        // uploader with a view-less DOM. Track whether we're disposing
-        // so we don't trigger an infinite loop.
-        this.disposing = true;
-        return this.remove();
-    },
-    /**
-     * @returns {wp.media.view.UploaderInline} Returns itself to allow chaining
-     */
-    remove: function() {
-        /**
-         * call 'remove' directly on the parent class
-         */
-        var result = View.prototype.remove.apply( this, arguments );
-
-        _.defer( _.bind( this.refresh, this ) );
-        return result;
-    },
-
-    refresh: function() {
-        var uploader = this.controller.uploader;
-
-        if ( uploader ) {
-            uploader.refresh();
-        }
-    },
-    /**
-     * @returns {wp.media.view.UploaderInline}
-     */
-    ready: function() {
-        var $browser = this.options.$browser,
-            $placeholder;
-
-        if ( this.controller.uploader ) {
-            $placeholder = this.$('.browser');
-
-            // Check if we've already replaced the placeholder.
-            if ( $placeholder[0] === $browser[0] ) {
-                return;
-            }
-
-            $browser.detach().text( $placeholder.text() );
-            $browser[0].className = $placeholder[0].className;
-            $placeholder.replaceWith( $browser.show() );
-        }
-
-        this.refresh();
-        return this;
-    },
-    show: function() {
-        this.$el.removeClass( 'hidden' );
-    },
-    hide: function() {
-        this.$el.addClass( 'hidden' );
-    }
-
-});
-
-module.exports = UploaderInline;
-
-},{}],72:[function(require,module,exports){
-/**
- * wp.media.view.UploaderStatusError
- *
- * @class
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var UploaderStatusError = wp.media.View.extend({
-    className: 'upload-error',
-    template:  wp.template('uploader-status-error')
-});
-
-module.exports = UploaderStatusError;
-
-},{}],73:[function(require,module,exports){
-/**
- * wp.media.view.UploaderStatus
- *
- * An uploader status for on-going uploads.
- *
- * @class
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var View = wp.media.View,
-    UploaderStatus;
-
-UploaderStatus = View.extend({
-    className: 'media-uploader-status',
-    template:  wp.template('uploader-status'),
-
-    events: {
-        'click .upload-dismiss-errors': 'dismiss'
-    },
-
-    initialize: function() {
-        this.queue = wp.Uploader.queue;
-        this.queue.on( 'add remove reset', this.visibility, this );
-        this.queue.on( 'add remove reset change:percent', this.progress, this );
-        this.queue.on( 'add remove reset change:uploading', this.info, this );
-
-        this.errors = wp.Uploader.errors;
-        this.errors.reset();
-        this.errors.on( 'add remove reset', this.visibility, this );
-        this.errors.on( 'add', this.error, this );
-    },
-    /**
-     * @global wp.Uploader
-     * @returns {wp.media.view.UploaderStatus}
-     */
-    dispose: function() {
-        wp.Uploader.queue.off( null, null, this );
-        /**
-         * call 'dispose' directly on the parent class
-         */
-        View.prototype.dispose.apply( this, arguments );
-        return this;
-    },
-
-    visibility: function() {
-        this.$el.toggleClass( 'uploading', !! this.queue.length );
-        this.$el.toggleClass( 'errors', !! this.errors.length );
-        this.$el.toggle( !! this.queue.length || !! this.errors.length );
-    },
-
-    ready: function() {
-        _.each({
-            '$bar':      '.media-progress-bar div',
-            '$index':    '.upload-index',
-            '$total':    '.upload-total',
-            '$filename': '.upload-filename'
-        }, function( selector, key ) {
-            this[ key ] = this.$( selector );
-        }, this );
-
-        this.visibility();
-        this.progress();
-        this.info();
-    },
-
-    progress: function() {
-        var queue = this.queue,
-            $bar = this.$bar;
-
-        if ( ! $bar || ! queue.length ) {
-            return;
-        }
-
-        $bar.width( ( queue.reduce( function( memo, attachment ) {
-            if ( ! attachment.get('uploading') ) {
-                return memo + 100;
-            }
-
-            var percent = attachment.get('percent');
-            return memo + ( _.isNumber( percent ) ? percent : 100 );
-        }, 0 ) / queue.length ) + '%' );
-    },
-
-    info: function() {
-        var queue = this.queue,
-            index = 0, active;
-
-        if ( ! queue.length ) {
-            return;
-        }
-
-        active = this.queue.find( function( attachment, i ) {
-            index = i;
-            return attachment.get('uploading');
-        });
-
-        this.$index.text( index + 1 );
-        this.$total.text( queue.length );
-        this.$filename.html( active ? this.filename( active.get('filename') ) : '' );
-    },
-    /**
-     * @param {string} filename
-     * @returns {string}
-     */
-    filename: function( filename ) {
-        return _.escape( filename );
-    },
-    /**
-     * @param {Backbone.Model} error
-     */
-    error: function( error ) {
-        this.views.add( '.upload-errors', new wp.media.view.UploaderStatusError({
-            filename: this.filename( error.get('file').name ),
-            message:  error.get('message')
-        }), { at: 0 });
-    },
-
-    /**
-     * @global wp.Uploader
-     *
-     * @param {Object} event
-     */
-    dismiss: function( event ) {
-        var errors = this.views.get('.upload-errors');
-
-        event.preventDefault();
-
-        if ( errors ) {
-            _.invoke( errors, 'remove' );
-        }
-        wp.Uploader.errors.reset();
-    }
-});
-
-module.exports = UploaderStatus;
-
-},{}],74:[function(require,module,exports){
-/**
- * wp.media.view.UploaderWindow
- *
- * An uploader window that allows for dragging and dropping media.
- *
- * @class
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- *
- * @param {object} [options]                   Options hash passed to the view.
- * @param {object} [options.uploader]          Uploader properties.
- * @param {jQuery} [options.uploader.browser]
- * @param {jQuery} [options.uploader.dropzone] jQuery collection of the dropzone.
- * @param {object} [options.uploader.params]
- */
-var $ = jQuery,
-    UploaderWindow;
-
-UploaderWindow = wp.media.View.extend({
-    tagName:   'div',
-    className: 'uploader-window',
-    template:  wp.template('uploader-window'),
-
-    initialize: function() {
-        var uploader;
-
-        this.$browser = $('<a href="#" class="browser" />').hide().appendTo('body');
-
-        uploader = this.options.uploader = _.defaults( this.options.uploader || {}, {
-            dropzone:  this.$el,
-            browser:   this.$browser,
-            params:    {}
-        });
-
-        // Ensure the dropzone is a jQuery collection.
-        if ( uploader.dropzone && ! (uploader.dropzone instanceof $) ) {
-            uploader.dropzone = $( uploader.dropzone );
-        }
-
-        this.controller.on( 'activate', this.refresh, this );
-
-        this.controller.on( 'detach', function() {
-            this.$browser.remove();
-        }, this );
-    },
-
-    refresh: function() {
-        if ( this.uploader ) {
-            this.uploader.refresh();
-        }
-    },
-
-    ready: function() {
-        var postId = wp.media.view.settings.post.id,
-            dropzone;
-
-        // If the uploader already exists, bail.
-        if ( this.uploader ) {
-            return;
-        }
-
-        if ( postId ) {
-            this.options.uploader.params.post_id = postId;
-        }
-        this.uploader = new wp.Uploader( this.options.uploader );
-
-        dropzone = this.uploader.dropzone;
-        dropzone.on( 'dropzone:enter', _.bind( this.show, this ) );
-        dropzone.on( 'dropzone:leave', _.bind( this.hide, this ) );
-
-        $( this.uploader ).on( 'uploader:ready', _.bind( this._ready, this ) );
-    },
-
-    _ready: function() {
-        this.controller.trigger( 'uploader:ready' );
-    },
-
-    show: function() {
-        var $el = this.$el.show();
-
-        // Ensure that the animation is triggered by waiting until
-        // the transparent element is painted into the DOM.
-        _.defer( function() {
-            $el.css({ opacity: 1 });
-        });
-    },
-
-    hide: function() {
-        var $el = this.$el.css({ opacity: 0 });
-
-        wp.media.transition( $el ).done( function() {
-            // Transition end events are subject to race conditions.
-            // Make sure that the value is set as intended.
-            if ( '0' === $el.css('opacity') ) {
-                $el.hide();
-            }
-        });
-
-        // https://core.trac.wordpress.org/ticket/27341
-        _.delay( function() {
-            if ( '0' === $el.css('opacity') && $el.is(':visible') ) {
-                $el.hide();
-            }
-        }, 500 );
-    }
-});
-
-module.exports = UploaderWindow;
-
-},{}],75:[function(require,module,exports){
-/**
- * wp.media.View
- *
- * The base view class for media.
- *
- * Undelegating events, removing events from the model, and
- * removing events from the controller mirror the code for
- * `Backbone.View.dispose` in Backbone 0.9.8 development.
- *
- * This behavior has since been removed, and should not be used
- * outside of the media manager.
- *
- * @class
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var View = wp.Backbone.View.extend({
-    constructor: function( options ) {
-        if ( options && options.controller ) {
-            this.controller = options.controller;
-        }
-        wp.Backbone.View.apply( this, arguments );
-    },
-    /**
-     * @todo The internal comment mentions this might have been a stop-gap
-     *       before Backbone 0.9.8 came out. Figure out if Backbone core takes
-     *       care of this in Backbone.View now.
-     *
-     * @returns {wp.media.View} Returns itself to allow chaining
-     */
-    dispose: function() {
-        // Undelegating events, removing events from the model, and
-        // removing events from the controller mirror the code for
-        // `Backbone.View.dispose` in Backbone 0.9.8 development.
-        this.undelegateEvents();
-
-        if ( this.model && this.model.off ) {
-            this.model.off( null, null, this );
-        }
-
-        if ( this.collection && this.collection.off ) {
-            this.collection.off( null, null, this );
-        }
-
-        // Unbind controller events.
-        if ( this.controller && this.controller.off ) {
-            this.controller.off( null, null, this );
-        }
-
-        return this;
-    },
-    /**
-     * @returns {wp.media.View} Returns itself to allow chaining
-     */
-    remove: function() {
-        this.dispose();
-        /**
-         * call 'remove' directly on the parent class
-         */
-        return wp.Backbone.View.prototype.remove.apply( this, arguments );
-    }
-});
-
-module.exports = View;
-
-},{}]},{},[19]);
+
+/***/ })
+/******/ ]));

branches/4.3/src/wp-includes/pluggable.php

@@ -1082 +1082 @@
  */
 function check_admin_referer( $action = -1, $query_arg = '_wpnonce' ) {
-    if ( -1 == $action )
-        _doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '3.2' );
+    if ( -1 === $action )
+        _doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '3.2.0' );
 
     $adminurl = strtolower(admin_url());
@@ -1100 +1100 @@
     do_action( 'check_admin_referer', $action, $result );
 
-    if ( ! $result && ! ( -1 == $action && strpos( $referer, $adminurl ) === 0 ) ) {
+    if ( ! $result && ! ( -1 === $action && strpos( $referer, $adminurl ) === 0 ) ) {
         wp_nonce_ays( $action );
         die();
@@ -1125 +1125 @@
  */
 function check_ajax_referer( $action = -1, $query_arg = false, $die = true ) {
+    if ( -1 === $action )
+        _doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '3.2.0' );
+
     $nonce = '';
 
@@ -2407 +2410 @@
 }
 endif;
-

branches/4.3/src/wp-includes/query.php

@@ -1401 +1401 @@
             , 'attachment_id'
             , 'name'
-            , 'static'
             , 'pagename'
             , 'page_id'
@@ -1605 +1604 @@
             // post is being queried.
             $this->is_single = true;
-        } elseif ( '' != $qv['static'] || '' != $qv['pagename'] || !empty($qv['page_id']) ) {
+        } elseif ( '' != $qv['pagename'] || !empty($qv['page_id']) ) {
             $this->is_page = true;
             $this->is_single = false;

branches/4.3/tests/phpunit/tests/auth.php

@@ -111 +111 @@
     }
 
+    /**
+     * @ticket 36361
+     */
+    public function test_check_admin_referer_with_no_action_triggers_doing_it_wrong() {
+        $this->setExpectedIncorrectUsage( 'check_admin_referer' );
+
+        // A valid nonce needs to be set so the check doesn't die()
+        $_REQUEST['_wpnonce'] = wp_create_nonce( -1 );
+        $result = check_admin_referer();
+        $this->assertSame( 1, $result );
+
+        unset( $_REQUEST['_wpnonce'] );
+    }
+
+    /**
+     * @ticket 36361
+     */
+    public function test_check_ajax_referer_with_no_action_triggers_doing_it_wrong() {
+        $this->setExpectedIncorrectUsage( 'check_ajax_referer' );
+
+        // A valid nonce needs to be set so the check doesn't die()
+        $_REQUEST['_wpnonce'] = wp_create_nonce( -1 );
+        $result = check_ajax_referer();
+        $this->assertSame( 1, $result );
+
+        unset( $_REQUEST['_wpnonce'] );
+    }
+
     function test_password_length_limit() {
         $passwords = array(