<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[50019] branches/4.3/src/wp-includes/js/media-views.js: Build/Test Tools: Correct JavaScript file in the 4.3 branch.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/50019">50019</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/50019","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>desrosj</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-01-25 20:15:27 +0000 (Mon, 25 Jan 2021)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Build/Test Tools: Correct JavaScript file in the 4.3 branch.

In <a href="https://core.trac.wordpress.org/changeset/46499">[46499]</a>, a JavaScript file was unintentionally changed. This restores that file to the correct state.

Partially reverts <a href="https://core.trac.wordpress.org/changeset/46499">[46499]</a>.
See <a href="https://core.trac.wordpress.org/ticket/52367">#52367</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branches43srcwpincludesjsmediaviewsjs">branches/4.3/src/wp-includes/js/media-views.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches43srcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.3/src/wp-includes/js/media-views.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.3/src/wp-includes/js/media-views.js    2021-01-25 20:14:35 UTC (rev 50018)
+++ branches/4.3/src/wp-includes/js/media-views.js      2021-01-25 20:15:27 UTC (rev 50019)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,228 +1,1369 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/******/ (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__) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+(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){
+/**
+ * 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 Selection = wp.media.model.Selection,
+       Library = wp.media.controller.Library,
+       CollectionAdd;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var media = wp.media,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+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() {
+               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 );
+               };
+
+               // 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 = CollectionAdd;
+
+},{}],2:[function(require,module,exports){
+/**
+ * wp.media.controller.CollectionEdit
+ *
+ * A state for editing a collection, which is used by audio and video playlists,
+ * and can be used for other collections.
+ *
+ * @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.title                  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 edit.
+ *                                                                       If one is not supplied, an empty media.model.Selection collection is created.
+ * @param {boolean}                    [attributes.multiple=false]       Whether multi-select is enabled.
+ * @param {string}                     [attributes.content=browse]       Initial mode for the content region.
+ * @param {string}                     attributes.menu                   Initial mode for the menu region. @todo this needs a better explanation.
+ * @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 {boolean}                    [attributes.describe=true]        Whether to offer UI to describe the attachments - e.g. captioning images in a gallery.
+ * @param {boolean}                    [attributes.dragInfo=true]        Whether to show instructional text about the attachments being sortable.
+ * @param {boolean}                    [attributes.dragInfoText]         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.SettingsView]         The view to edit the collection instance settings (e.g. Playlist settings with "Show tracklist" checkbox).
+ * @param {view}                       [attributes.AttachmentView]       The single `Attachment` view to be used in the `Attachments`.
+ *                                                                       If none supplied, defaults to wp.media.view.Attachment.EditLibrary.
+ * @param {string}                     attributes.type                   The collection's media type. (e.g. 'video').
+ * @param {string}                     attributes.collectionType         The collection type. (e.g. 'playlist').
+ */
+var Library = wp.media.controller.Library,
+       l10n = wp.media.view.l10n,
</ins><span class="cx" style="display: block; padding: 0 10px">         $ = jQuery,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        l10n;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ CollectionEdit;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-media.isTouchDevice = ( 'ontouchend' in document );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+CollectionEdit = Library.extend({
+       defaults: {
+               multiple:         false,
+               sortable:         true,
+               date:             false,
+               searchable:       false,
+               content:          'browse',
+               describe:         true,
+               dragInfo:         true,
+               idealColumnWidth: 170,
+               editing:          false,
+               priority:         60,
+               SettingsView:     false,
+               syncSelection:    false
+       },
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Link any localized strings.
-l10n = media.view.l10n = window._wpMediaViewsL10n || {};
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+        * @since 3.9.0
+        */
+       initialize: function() {
+               var collectionType = this.get('collectionType');
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Link any settings.
-media.view.settings = l10n.settings || {};
-delete l10n.settings;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( 'video' === this.get( 'type' ) ) {
+                       collectionType = 'video-' + collectionType;
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Copy the `post` setting over to the model settings.
-media.model.settings.post = media.view.settings.post;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.set( 'id', collectionType + '-edit' );
+               this.set( 'toolbar', collectionType + '-edit' );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// 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;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 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 );
+       },
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        transition = _.find( _.keys( transitions ), function( transition ) {
-               return ! _.isUndefined( style[ transition ] );
-       });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+        * @since 3.9.0
+        */
+       activate: function() {
+               var library = this.get('library');
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        return transition && {
-               end: transitions[ transition ]
-       };
-}());
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Limit the library to images only.
+               library.props.set( 'type', this.get( 'type' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // Watch for uploaded attachments.
+               this.get('library').observe( wp.Uploader.queue );
+
+               this.frame.on( 'content:render:browse', this.renderSettings, this );
+
+               Library.prototype.activate.apply( this, arguments );
+       },
+
+       /**
+        * @since 3.9.0
+        */
+       deactivate: function() {
+               // Stop watching for uploaded attachments.
+               this.get('library').unobserve( wp.Uploader.queue );
+
+               this.frame.off( 'content:render:browse', this.renderSettings, this );
+
+               Library.prototype.deactivate.apply( this, arguments );
+       },
+
+       /**
+        * Render the collection embed settings view in the browser sidebar.
+        *
+        * @todo This is against the pattern elsewhere in media. Typically the frame
+        *       is responsible for adding region mode callbacks. Explain.
+        *
+        * @since 3.9.0
+        *
+        * @param {wp.media.view.attachmentsBrowser} The attachments browser view.
+        */
+       renderSettings: function( attachmentsBrowserView ) {
+               var library = this.get('library'),
+                       collectionType = this.get('collectionType'),
+                       dragInfoText = this.get('dragInfoText'),
+                       SettingsView = this.get('SettingsView'),
+                       obj = {};
+
+               if ( ! library || ! attachmentsBrowserView ) {
+                       return;
+               }
+
+               library[ collectionType ] = library[ collectionType ] || new Backbone.Model();
+
+               obj[ collectionType ] = new SettingsView({
+                       controller: this,
+                       model:      library[ collectionType ],
+                       priority:   40
+               });
+
+               attachmentsBrowserView.sidebar.set( obj );
+
+               if ( dragInfoText ) {
+                       attachmentsBrowserView.toolbar.set( 'dragInfo', new wp.media.View({
+                               el: $( '<div class="instructions">' + dragInfoText + '</div>' )[0],
+                               priority: -40
+                       }) );
+               }
+
+               // Add the 'Reverse order' button to the toolbar.
+               attachmentsBrowserView.toolbar.set( 'reverse', {
+                       text:     l10n.reverseOrder,
+                       priority: 80,
+
+                       click: function() {
+                               library.reset( library.toArray().reverse() );
+                       }
+               });
+       }
+});
+
+module.exports = CollectionEdit;
+
+},{}],3:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * A shared event bus used to provide events into
- * the media workflows that 3rd-party devs can use to hook
- * in.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * wp.media.controller.Cropper
+ *
+ * A state for cropping an image.
+ *
+ * @class
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-media.events = _.extend( {}, Backbone.Events );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var l10n = wp.media.view.l10n,
+       Cropper;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+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;
+
+},{}],4:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Makes it easier to bind events using transitions.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * wp.media.controller.CustomizeImageCropper
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param {string} selector
- * @param {Number} sensitivity
- * @returns {Promise}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * A state for cropping an image.
+ *
+ * @class
+ * @augments wp.media.controller.Cropper
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-media.transition = function( selector, sensitivity ) {
-       var deferred = $.Deferred();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Controller = wp.media.controller,
+       CustomizeImageCropper;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        sensitivity = sensitivity || 2000;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+CustomizeImageCropper = Controller.Cropper.extend({
+       doCrop: function( attachment ) {
+               var cropDetails = attachment.get( 'cropDetails' ),
+                       control = this.get( 'control' );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( $.support.transition ) {
-               if ( ! (selector instanceof $) ) {
-                       selector = $( selector );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         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 );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Resolve the deferred when the first element finishes animating.
-               selector.first().one( $.support.transition.end, deferred.resolve );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         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;
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Just in case the event doesn't trigger, fire a callback.
-               _.delay( deferred.resolve, sensitivity );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         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();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Otherwise, execute on the spot.
-       } else {
-               deferred.resolve();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         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();
+               }
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+});
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        return deferred.promise();
-};
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Embed;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-media.controller.Region = __webpack_require__( 27 );
-media.controller.StateMachine = __webpack_require__( 28 );
-media.controller.State = __webpack_require__( 29 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],7:[function(require,module,exports){
+/**
+ * wp.media.controller.FeaturedImage
+ *
+ * A state for selecting a featured image for a post.
+ *
+ * @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=featured-image]        Unique identifier.
+ * @param {string}                     [attributes.title=Set Featured Image] 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 images will be created.
+ * @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=featured-image]   Initial mode for the toolbar region.
+ * @param {int}                        [attributes.priority=60]              The priority for the state link in the media menu.
+ * @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 Attachment = wp.media.model.Attachment,
+       Library = wp.media.controller.Library,
+       l10n = wp.media.view.l10n,
+       FeaturedImage;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-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 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+FeaturedImage = Library.extend({
+       defaults: _.defaults({
+               id:            'featured-image',
+               title:         l10n.setFeaturedImageTitle,
+               multiple:      false,
+               filterable:    'uploaded',
+               toolbar:       'featured-image',
+               priority:      60,
+               syncSelection: true
+       }, Library.prototype.defaults ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-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 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+        * @since 3.5.0
+        */
+       initialize: function() {
+               var library, comparator;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // If we haven't been provided a `library`, create a `Selection`.
+               if ( ! this.get('library') ) {
+                       this.set( 'library', wp.media.query({ type: 'image' }) );
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/***/ }),
-/* 27 */
-/***/ (function(module, exports) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         Library.prototype.initialize.apply( this, arguments );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                library    = this.get('library');
+               comparator = library.comparator;
+
+               // Overload the library's comparator to push items that are not in
+               // the mirrored query to the front of the aggregate collection.
+               library.comparator = function( a, b ) {
+                       var aInQuery = !! this.mirroring.get( a.cid ),
+                               bInQuery = !! this.mirroring.get( b.cid );
+
+                       if ( ! aInQuery && bInQuery ) {
+                               return -1;
+                       } else if ( aInQuery && ! bInQuery ) {
+                               return 1;
+                       } else {
+                               return comparator.apply( this, arguments );
+                       }
+               };
+
+               // Add all items in the selection to the library, so any featured
+               // images that are not initially loaded still appear.
+               library.observe( this.get('selection') );
+       },
+
+       /**
+        * @since 3.5.0
+        */
+       activate: function() {
+               this.updateSelection();
+               this.frame.on( 'open', this.updateSelection, this );
+
+               Library.prototype.activate.apply( this, arguments );
+       },
+
+       /**
+        * @since 3.5.0
+        */
+       deactivate: function() {
+               this.frame.off( 'open', this.updateSelection, this );
+
+               Library.prototype.deactivate.apply( this, arguments );
+       },
+
+       /**
+        * @since 3.5.0
+        */
+       updateSelection: function() {
+               var selection = this.get('selection'),
+                       id = wp.media.view.settings.post.featuredImageId,
+                       attachment;
+
+               if ( '' !== id && -1 !== id ) {
+                       attachment = Attachment.get( id );
+                       attachment.fetch();
+               }
+
+               selection.reset( attachment ? [ attachment ] : [] );
+       }
+});
+
+module.exports = FeaturedImage;
+
+},{}],8:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 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){
+/**
</ins><span class="cx" style="display: block; padding: 0 10px">  * wp.media.controller.Region
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * A region is a persistent application layout area.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -400,12 +1541,165 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Region;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],14:[function(require,module,exports){
+/**
+ * wp.media.controller.ReplaceImage
+ *
+ * A state for replacing an image.
+ *
+ * @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=replace-image]        Unique identifier.
+ * @param {string}                     [attributes.title=Replace Image]     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 images will be created.
+ * @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=replace]         Initial mode for the toolbar region.
+ * @param {int}                        [attributes.priority=60]             The priority for the state link in the media menu.
+ * @param {boolean}                    [attributes.searchable=true]         Whether the library is searchable.
+ * @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 {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 Library = wp.media.controller.Library,
+       l10n = wp.media.view.l10n,
+       ReplaceImage;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/***/ }),
-/* 28 */
-/***/ (function(module, exports) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ReplaceImage = Library.extend({
+       defaults: _.defaults({
+               id:            'replace-image',
+               title:         l10n.replaceImageTitle,
+               multiple:      false,
+               filterable:    'uploaded',
+               toolbar:       'replace',
+               menu:          false,
+               priority:      60,
+               syncSelection: true
+       }, Library.prototype.defaults ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        /**
+        * @since 3.9.0
+        *
+        * @param options
+        */
+       initialize: function( options ) {
+               var library, comparator;
+
+               this.image = options.image;
+               // If we haven't been provided a `library`, create a `Selection`.
+               if ( ! this.get('library') ) {
+                       this.set( 'library', wp.media.query({ type: 'image' }) );
+               }
+
+               Library.prototype.initialize.apply( this, arguments );
+
+               library    = this.get('library');
+               comparator = library.comparator;
+
+               // Overload the library's comparator to push items that are not in
+               // the mirrored query to the front of the aggregate collection.
+               library.comparator = function( a, b ) {
+                       var aInQuery = !! this.mirroring.get( a.cid ),
+                               bInQuery = !! this.mirroring.get( b.cid );
+
+                       if ( ! aInQuery && bInQuery ) {
+                               return -1;
+                       } else if ( aInQuery && ! bInQuery ) {
+                               return 1;
+                       } else {
+                               return comparator.apply( this, arguments );
+                       }
+               };
+
+               // Add all items in the selection to the library, so any featured
+               // images that are not initially loaded still appear.
+               library.observe( this.get('selection') );
+       },
+
+       /**
+        * @since 3.9.0
+        */
+       activate: function() {
+               this.updateSelection();
+               Library.prototype.activate.apply( this, arguments );
+       },
+
+       /**
+        * @since 3.9.0
+        */
+       updateSelection: function() {
+               var selection = this.get('selection'),
+                       attachment = this.image.attachment;
+
+               selection.reset( attachment ? [ attachment ] : [] );
+       }
+});
+
+module.exports = ReplaceImage;
+
+},{}],15:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * wp.media.controller.SiteIconCropper
+ *
+ * A state for cropping a Site Icon.
+ *
+ * @class
+ * @augments wp.media.controller.Cropper
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ */
+var Controller = wp.media.controller,
+       SiteIconCropper;
+
+SiteIconCropper = Controller.Cropper.extend({
+       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));
+       },
+
+       createCropContent: function() {
+               this.cropperView = new wp.media.view.SiteIconCropper({
+                       controller: this,
+                       attachment: this.get('selection').first()
+               });
+               this.cropperView.on('image-loaded', this.createCropToolbar, this);
+               this.frame.content.set(this.cropperView);
+
+       },
+
+       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', {
+                       nonce: attachment.get( 'nonces' ).edit,
+                       id: attachment.get( 'id' ),
+                       context: 'site-icon',
+                       cropDetails: cropDetails
+               } );
+       }
+});
+
+module.exports = SiteIconCropper;
+
+},{}],16:[function(require,module,exports){
+/**
</ins><span class="cx" style="display: block; padding: 0 10px">  * wp.media.controller.StateMachine
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * A state machine keeps track of state. It is in one state at a time,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -528,11 +1822,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = StateMachine;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-/***/ }),
-/* 29 */
-/***/ (function(module, exports) {
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],17:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * wp.media.controller.State
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -773,11 +2063,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = State;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-/***/ }),
-/* 30 */
-/***/ (function(module, exports) {
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],18:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * wp.media.selectionSync
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -843,1658 +2129,2610 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = selectionSync;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],19:[function(require,module,exports){
+var media = wp.media,
+       $ = jQuery,
+       l10n;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/***/ }),
-/* 31 */
-/***/ (function(module, exports) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+media.isTouchDevice = ( 'ontouchend' in document );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// 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 ]
+       };
+}());
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * wp.media.controller.Library
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 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.
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * A state for choosing an attachment or group of attachments from the media library.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @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/a
 ttachment-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/w
 indow.js":74,"./views/view.js":75}],20:[function(require,module,exports){
+/**
+ * wp.media.view.AttachmentCompat
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * A view to display fields added via the `attachment_fields_to_edit` filter.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px">  * @class
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @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.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var l10n = wp.media.view.l10n,
-       getUserSetting = window.getUserSetting,
-       setUserSetting = window.setUserSetting,
-       Library;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var View = wp.media.View,
+       AttachmentCompat;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+AttachmentCompat = View.extend({
+       tagName:   'form',
+       className: 'compat-item',
+
+       events: {
+               'submit':          'preventDefault',
+               'change input':    'save',
+               'change select':   'save',
+               'change textarea': 'save'
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        initialize: function() {
+               this.listenTo( this.model, 'change:compat', this.render );
+       },
</ins><span class="cx" style="display: block; padding: 0 10px">         /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * If a library isn't provided, query all media items.
-        * If a selection instance isn't provided, create one.
-        *
-        * @since 3.5.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @returns {wp.media.view.AttachmentCompat} Returns itself to allow chaining
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        initialize: function() {
-               var selection = this.get('selection'),
-                       props;
-
-               if ( ! this.get('library') ) {
-                       this.set( 'library', wp.media.query() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ dispose: function() {
+               if ( this.$(':focus').length ) {
+                       this.save();
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-               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
-                       }) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /**
+                * 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;
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.resetDisplays();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.views.detach();
+               this.$el.html( compat.item );
+               this.views.render();
+               return this;
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">         /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since 3.5.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param {Object} event
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        activate: function() {
-               this.syncSelection();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ preventDefault: function( event ) {
+               event.preventDefault();
+       },
+       /**
+        * @param {Object} event
+        */
+       save: function( event ) {
+               var data = {};
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                wp.Uploader.queue.on( 'add', this.uploading, this );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( event ) {
+                       event.preventDefault();
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.get('selection').on( 'add remove reset', this.refreshContent, this );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         _.each( this.$el.serializeArray(), function( pair ) {
+                       data[ pair.name ] = pair.value;
+               });
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( this.get( 'router' ) && this.get('contentUserSetting') ) {
-                       this.frame.on( 'content:activate', this.saveContentMode, this );
-                       this.set( 'content', getUserSetting( 'libraryContent', this.get('content') ) );
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.controller.trigger( 'attachment:compat:waiting', ['waiting'] );
+               this.model.saveCompat( data ).always( _.bind( this.postSave, this ) );
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * @since 3.5.0
-        */
-       deactivate: function() {
-               this.recordSelection();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ postSave: function() {
+               this.controller.trigger( 'attachment:compat:ready', ['ready'] );
+       }
+});
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.frame.off( 'content:activate', this.saveContentMode, this );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = AttachmentCompat;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Unbind all event handlers that use this state as the context
-               // from the selection.
-               this.get('selection').off( null, null, this );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],21:[function(require,module,exports){
+/**
+ * wp.media.view.AttachmentFilters
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var $ = jQuery,
+       AttachmentFilters;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                wp.Uploader.queue.off( null, null, this );
-       },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+AttachmentFilters = wp.media.View.extend({
+       tagName:   'select',
+       className: 'attachment-filters',
+       id:        'media-attachment-filters',
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Reset the library to its initial state.
-        *
-        * @since 3.5.0
-        */
-       reset: function() {
-               this.get('selection').reset();
-               this.resetDisplays();
-               this.refreshContent();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ events: {
+               change: 'change'
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * 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' )
-               };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ keys: [],
+
+       initialize: function() {
+               this.createFilters();
+               _.extend( this.filters, this.options.filters );
+
+               // Build `<option>` elements.
+               this.$el.html( _.chain( this.filters ).map( function( filter, value ) {
+                       return {
+                               el: $( '<option></option>' ).val( value ).html( filter.text )[0],
+                               priority: filter.priority || 50
+                       };
+               }, this ).sortBy('priority').pluck('el').value() );
+
+               this.listenTo( this.model, 'change', this.select );
+               this.select();
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * 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}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @abstract
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        display: function( attachment ) {
-               var displays = this._displays;
-
-               if ( ! displays[ attachment.cid ] ) {
-                       displays[ attachment.cid ] = new Backbone.Model( this.defaultDisplaySettings( attachment ) );
-               }
-               return displays[ attachment.cid ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ createFilters: function() {
+               this.filters = {};
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Given an attachment, create attachment display settings properties.
-        *
-        * @since 3.6.0
-        *
-        * @param {wp.media.model.Attachment} attachment
-        * @returns {Object}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * When the selected filter changes, update the Attachment Query properties to match.
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        defaultDisplaySettings: function( attachment ) {
-               var settings = this._defaultDisplaySettings;
-               if ( settings.canEmbed = this.canEmbed( attachment ) ) {
-                       settings.link = 'embed';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ change: function() {
+               var filter = this.filters[ this.el.value ];
+               if ( filter ) {
+                       this.model.set( filter.props );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return settings;
</del><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * 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;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ select: function() {
+               var model = this.model,
+                       value = 'all',
+                       props = model.toJSON();
+
+               _.find( this.filters, function( filter, id ) {
+                       var equal = _.all( filter.props, function( prop, key ) {
+                               return prop === ( _.isUndefined( props[ key ] ) ? null : props[ key ] );
+                       });
+
+                       if ( equal ) {
+                               return value = id;
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         });
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return _.contains( wp.media.view.settings.embedExts, attachment.get('filename').split('.').pop() );
-       },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.$el.val( value );
+       }
+});
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = AttachmentFilters;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * 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();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],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;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( this.active && ! selection.length && router && ! router.get( mode ) ) {
-                       this.frame.content.render( this.get('content') );
-               }
-       },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+All = wp.media.view.AttachmentFilters.extend({
+       createFilters: function() {
+               var filters = {};
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * 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;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         _.each( wp.media.view.settings.mimeTypes || {}, function( text, key ) {
+                       filters[ key ] = {
+                               text: text,
+                               props: {
+                                       status:  null,
+                                       type:    key,
+                                       uploadedTo: null,
+                                       orderby: 'date',
+                                       order:   'DESC'
+                               }
+                       };
+               });
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( 'upload' === content.mode() ) {
-                       this.frame.content.mode('browse');
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         filters.all = {
+                       text:  l10n.allMediaItems,
+                       props: {
+                               status:  null,
+                               type:    null,
+                               uploadedTo: null,
+                               orderby: 'date',
+                               order:   'DESC'
+                       },
+                       priority: 10
+               };
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( this.get( 'autoSelect' ) ) {
-                       this.get('selection').add( attachment );
-                       this.frame.trigger( 'library:selection:add' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         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
+                       };
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        },
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Persist the mode of the content region as a user setting.
-        *
-        * @since 3.5.0
-        */
-       saveContentMode: function() {
-               if ( 'browse' !== this.get('router') ) {
-                       return;
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         filters.unattached = {
+                       text:  l10n.unattached,
+                       props: {
+                               status:     null,
+                               uploadedTo: 0,
+                               type:       null,
+                               orderby:    'menuOrder',
+                               order:      'ASC'
+                       },
+                       priority: 50
+               };
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                var mode = this.frame.content.mode(),
-                       view = this.frame.router.get();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( wp.media.view.settings.mediaTrash &&
+                       this.controller.isModeActive( 'grid' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( view && view.get( mode ) ) {
-                       setUserSetting( 'libraryContent', mode );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 filters.trash = {
+                               text:  l10n.trash,
+                               props: {
+                                       uploadedTo: null,
+                                       status:     'trash',
+                                       type:       null,
+                                       orderby:    'date',
+                                       order:      'DESC'
+                               },
+                               priority: 50
+                       };
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+               this.filters = filters;
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Make selectionSync available on any Media Library state.
-_.extend( Library.prototype, wp.media.selectionSync );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = All;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-module.exports = Library;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],23:[function(require,module,exports){
+/**
+ * A filter dropdown for month/dates.
+ *
+ * @class
+ * @augments wp.media.view.AttachmentFilters
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var l10n = wp.media.view.l10n,
+       DateFilter;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+DateFilter = wp.media.view.AttachmentFilters.extend({
+       id: 'media-attachment-date-filters',
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/***/ }),
-/* 32 */
-/***/ (function(module, exports) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ createFilters: function() {
+               var filters = {};
+               _.each( wp.media.view.settings.months || {}, function( value, index ) {
+                       filters[ index ] = {
+                               text: value.text,
+                               props: {
+                                       year: value.year,
+                                       monthnum: value.month
+                               }
+                       };
+               });
+               filters.all = {
+                       text:  l10n.allDates,
+                       props: {
+                               monthnum: false,
+                               year:  false
+                       },
+                       priority: 10
+               };
+               this.filters = filters;
+       }
+});
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = DateFilter;
+
+},{}],24:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * wp.media.controller.ImageDetails
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * wp.media.view.AttachmentFilters.Uploaded
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * A state for editing the attachment display settings of an image that's been
- * inserted into the editor.
- *
</del><span class="cx" style="display: block; padding: 0 10px">  * @class
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @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.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @augments wp.media.view.AttachmentFilters
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var State = wp.media.controller.State,
-       Library = wp.media.controller.Library,
-       l10n = wp.media.view.l10n,
-       ImageDetails;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var l10n = wp.media.view.l10n,
+       Uploaded;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-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 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Uploaded = wp.media.view.AttachmentFilters.extend({
+       createFilters: function() {
+               var type = this.model.get('type'),
+                       types = wp.media.view.settings.mimeTypes,
+                       text;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * @since 3.9.0
-        *
-        * @param options Attributes
-        */
-       initialize: function( options ) {
-               this.image = options.image;
-               State.prototype.initialize.apply( this, arguments );
-       },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( types && type ) {
+                       text = types[ type ];
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * @since 3.9.0
-        */
-       activate: function() {
-               this.frame.modal.$el.addClass('image-details');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.filters = {
+                       all: {
+                               text:  text || l10n.allMediaItems,
+                               props: {
+                                       uploadedTo: null,
+                                       orderby: 'date',
+                                       order:   'DESC'
+                               },
+                               priority: 10
+                       },
+
+                       uploaded: {
+                               text:  l10n.uploadedToThisPost,
+                               props: {
+                                       uploadedTo: wp.media.view.settings.post.id,
+                                       orderby: 'menuOrder',
+                                       order:   'ASC'
+                               },
+                               priority: 20
+                       },
+
+                       unattached: {
+                               text:  l10n.unattached,
+                               props: {
+                                       uploadedTo: 0,
+                                       orderby: 'menuOrder',
+                                       order:   'ASC'
+                               },
+                               priority: 50
+                       }
+               };
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-module.exports = ImageDetails;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Uploaded;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-/***/ }),
-/* 33 */
-/***/ (function(module, exports) {
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],25:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * wp.media.controller.GalleryEdit
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * wp.media.view.Attachment
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * A state for editing a gallery's images and settings.
- *
</del><span class="cx" style="display: block; padding: 0 10px">  * @class
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @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.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Library = wp.media.controller.Library,
-       l10n = wp.media.view.l10n,
-       GalleryEdit;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var View = wp.media.View,
+       $ = jQuery,
+       Attachment;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+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' )
+               };
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * @since 3.5.0
-        */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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: {},
+
</ins><span class="cx" style="display: block; padding: 0 10px">         initialize: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If we haven't been provided a `library`, create a `Selection`.
-               if ( ! this.get('library') ) {
-                       this.set( 'library', new wp.media.model.Selection() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         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 );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                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 );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // The single `Attachment` view to be used in the `Attachments` view.
-               if ( ! this.get('AttachmentView') ) {
-                       this.set( 'AttachmentView', wp.media.view.Attachment.EditLibrary );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 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') );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                Library.prototype.initialize.apply( this, arguments );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.listenTo( this.controller, 'attachment:compat:waiting attachment:compat:ready', this.updateSave );
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        /**
+        * @returns {wp.media.view.Attachment} Returns itself to allow chaining
+        */
+       dispose: function() {
+               var selection = this.options.selection;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // 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;
+       },
</ins><span class="cx" style="display: block; padding: 0 10px">         /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since 3.5.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @returns {wp.media.view.Attachment} Returns itself to allow chaining
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        activate: function() {
-               var library = this.get('library');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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 );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Limit the library to images only.
-               library.props.set( 'type', 'image' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         options.buttons  = this.buttons;
+               options.describe = this.controller.state().get('describe');
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Watch for uploaded attachments.
-               this.get('library').observe( wp.Uploader.queue );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( 'image' === options.type ) {
+                       options.size = this.imageSize();
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.frame.on( 'content:render:browse', this.gallerySettings, this );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         options.can = {};
+               if ( options.nonces ) {
+                       options.can.remove = !! options.nonces['delete'];
+                       options.can.save = !! options.nonces.update;
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                Library.prototype.activate.apply( this, arguments );
-       },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( this.controller.state().get('allowLocalEdits') ) {
+                       options.allowLocalEdits = true;
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * @since 3.5.0
-        */
-       deactivate: function() {
-               // Stop watching for uploaded attachments.
-               this.get('library').unobserve( wp.Uploader.queue );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( options.uploading && ! options.percent ) {
+                       options.percent = 0;
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.frame.off( 'content:render:browse', this.gallerySettings, this );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.views.detach();
+               this.$el.html( this.template( options ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                Library.prototype.deactivate.apply( this, arguments );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         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;
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        progress: function() {
+               if ( this.$bar && this.$bar.length ) {
+                       this.$bar.width( this.model.get('percent') + '%' );
+               }
+       },
+
</ins><span class="cx" style="display: block; padding: 0 10px">         /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since 3.5.0
-        *
-        * @param browser
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param {Object} event
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        gallerySettings: function( browser ) {
-               if ( ! this.get('displaySettings') ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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 ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         return;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                var library = this.get('library');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Catch arrow events
+               if ( 37 === event.keyCode || 38 === event.keyCode || 39 === event.keyCode || 40 === event.keyCode ) {
+                       this.controller.trigger( 'attachment:keydown:arrow', event );
+                       return;
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( ! library || ! browser ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Catch enter and space events
+               if ( 'keydown' === event.type && 13 !== event.keyCode && 32 !== event.keyCode ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         return;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                library.gallery = library.gallery || new Backbone.Model();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         event.preventDefault();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                browser.sidebar.set({
-                       gallery: new wp.media.view.Settings.Gallery({
-                               controller: this,
-                               model:      library.gallery,
-                               priority:   40
-                       })
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 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
</ins><span class="cx" style="display: block; padding: 0 10px">                 });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                browser.toolbar.set( 'reverse', {
-                       text:     l10n.reverseOrder,
-                       priority: 80,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         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;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        click: function() {
-                               library.reset( library.toArray().reverse() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         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;
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                });
-       }
-});
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-module.exports = GalleryEdit;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 singleIndex = collection.indexOf( single );
+                       modelIndex  = collection.indexOf( this.model );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        if ( singleIndex < modelIndex ) {
+                               models = collection.models.slice( singleIndex, modelIndex + 1 );
+                       } else {
+                               models = collection.models.slice( modelIndex, singleIndex + 1 );
+                       }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/***/ }),
-/* 34 */
-/***/ (function(module, exports) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 selection.add( models );
+                       selection.single( model );
+                       return;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/**
- * 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;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 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;
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-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 ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Fixes bug that loses focus when selecting a featured image
+               if ( ! method ) {
+                       method = 'add';
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                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' ]();
+       },
</ins><span class="cx" style="display: block; padding: 0 10px">         /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since 3.5.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @returns {unresolved|Boolean}
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        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' }) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ selected: function() {
+               var selection = this.options.selection;
+               if ( selection ) {
+                       return !! selection.get( this.model.cid );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        },
+       /**
+        * @param {Backbone.Model} model
+        * @param {Backbone.Collection} collection
+        */
+       select: function( model, collection ) {
+               var selection = this.options.selection,
+                       controller = this.controller;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                Library.prototype.initialize.apply( this, arguments );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 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' );
+               }
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        /**
+        * @param {Backbone.Model} model
+        * @param {Backbone.Collection} collection
+        */
+       deselect: function( model, collection ) {
+               var selection = this.options.selection;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // 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' );
+       },
</ins><span class="cx" style="display: block; padding: 0 10px">         /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since 3.5.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param {Backbone.Model} model
+        * @param {Backbone.Collection} collection
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        activate: function() {
-               var library = this.get('library'),
-                       edit    = this.frame.state('gallery-edit').get('library');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ details: function( model, collection ) {
+               var selection = this.options.selection,
+                       details;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( this.editLibrary && this.editLibrary !== edit ) {
-                       library.unobserve( this.editLibrary );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( selection !== collection ) {
+                       return;
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 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 );
-               };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         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;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 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;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         size = size || 'medium';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                Library.prototype.activate.apply( this, arguments );
-       }
-});
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 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;
+                       }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-module.exports = GalleryAdd;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( matched ) {
+                               return _.clone( matched );
+                       }
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                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;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/***/ }),
-/* 35 */
-/***/ (function(module, exports) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( ! $setting.length ) {
+                       return;
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/**
- * wp.media.controller.CollectionEdit
- *
- * A state for editing a collection, which is used by audio and video playlists,
- * and can be used for other collections.
- *
- * @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.title                  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 edit.
- *                                                                       If one is not supplied, an empty media.model.Selection collection is created.
- * @param {boolean}                    [attributes.multiple=false]       Whether multi-select is enabled.
- * @param {string}                     [attributes.content=browse]       Initial mode for the content region.
- * @param {string}                     attributes.menu                   Initial mode for the menu region. @todo this needs a better explanation.
- * @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 {boolean}                    [attributes.describe=true]        Whether to offer UI to describe the attachments - e.g. captioning images in a gallery.
- * @param {boolean}                    [attributes.dragInfo=true]        Whether to show instructional text about the attachments being sortable.
- * @param {boolean}                    [attributes.dragInfoText]         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.SettingsView]         The view to edit the collection instance settings (e.g. Playlist settings with "Show tracklist" checkbox).
- * @param {view}                       [attributes.AttachmentView]       The single `Attachment` view to be used in the `Attachments`.
- *                                                                       If none supplied, defaults to wp.media.view.Attachment.EditLibrary.
- * @param {string}                     attributes.type                   The collection's media type. (e.g. 'video').
- * @param {string}                     attributes.collectionType         The collection type. (e.g. 'playlist').
- */
-var Library = wp.media.controller.Library,
-       l10n = wp.media.view.l10n,
-       $ = jQuery,
-       CollectionEdit;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         setting = $setting.data('setting');
+               value   = event.target.value;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-CollectionEdit = Library.extend({
-       defaults: {
-               multiple:         false,
-               sortable:         true,
-               date:             false,
-               searchable:       false,
-               content:          'browse',
-               describe:         true,
-               dragInfo:         true,
-               idealColumnWidth: 170,
-               editing:          false,
-               priority:         60,
-               SettingsView:     false,
-               syncSelection:    false
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( this.model.get( setting ) !== value ) {
+                       this.save( setting, value );
+               }
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since 3.9.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * 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.
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        initialize: function() {
-               var collectionType = this.get('collectionType');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( 'video' === this.get( 'type' ) ) {
-                       collectionType = 'video-' + collectionType;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If we're waiting to remove 'Saved.', stop.
+               if ( save.savedTimer ) {
+                       clearTimeout( save.savedTimer );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.set( 'id', collectionType + '-edit' );
-               this.set( 'toolbar', collectionType + '-edit' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.updateSave('waiting');
+               save.requests = requests;
+               requests.always( function() {
+                       // If we've performed another request since this one, bail.
+                       if ( save.requests !== requests ) {
+                               return;
+                       }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 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 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 view.updateSave( requests.state() === 'resolved' ? 'complete' : 'error' );
+                       save.savedTimer = setTimeout( function() {
+                               view.updateSave('ready');
+                               delete save.savedTimer;
+                       }, 2000 );
+               });
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">         /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since 3.9.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param {string} status
+        * @returns {wp.media.view.Attachment} Returns itself to allow chaining
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        activate: function() {
-               var library = this.get('library');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ updateSave: function( status ) {
+               var save = this._save = this._save || { status: 'ready' };
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Limit the library to images only.
-               library.props.set( 'type', this.get( 'type' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( status && status !== save.status ) {
+                       this.$el.removeClass( 'save-' + save.status );
+                       save.status = status;
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Watch for uploaded attachments.
-               this.get('library').observe( wp.Uploader.queue );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.$el.addClass( 'save-' + save.status );
+               return this;
+       },
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.frame.on( 'content:render:browse', this.renderSettings, this );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ updateAll: function() {
+               var $settings = this.$('[data-setting]'),
+                       model = this.model,
+                       changed;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                Library.prototype.activate.apply( this, arguments );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         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 );
+               }
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">         /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since 3.9.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param {Object} event
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        deactivate: function() {
-               // Stop watching for uploaded attachments.
-               this.get('library').unobserve( wp.Uploader.queue );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ removeFromLibrary: function( event ) {
+               // Catch enter and space events
+               if ( 'keydown' === event.type && 13 !== event.keyCode && 32 !== event.keyCode ) {
+                       return;
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.frame.off( 'content:render:browse', this.renderSettings, this );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Stop propagation so the model isn't selected.
+               event.stopPropagation();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                Library.prototype.deactivate.apply( this, arguments );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.collection.remove( this.model );
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Render the collection embed settings view in the browser sidebar.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Add the model if it isn't in the selection, if it is in the selection,
+        * remove it.
</ins><span class="cx" style="display: block; padding: 0 10px">          *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @todo This is against the pattern elsewhere in media. Typically the frame
-        *       is responsible for adding region mode callbacks. Explain.
-        *
-        * @since 3.9.0
-        *
-        * @param {wp.media.view.attachmentsBrowser} The attachments browser view.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param  {[type]} event [description]
+        * @return {[type]}       [description]
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        renderSettings: function( attachmentsBrowserView ) {
-               var library = this.get('library'),
-                       collectionType = this.get('collectionType'),
-                       dragInfoText = this.get('dragInfoText'),
-                       SettingsView = this.get('SettingsView'),
-                       obj = {};
-
-               if ( ! library || ! attachmentsBrowserView ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ checkClickHandler: function ( event ) {
+               var selection = this.options.selection;
+               if ( ! selection ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         return;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                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 );
+               }
+       }
+});
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                library[ collectionType ] = library[ collectionType ] || new Backbone.Model();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// 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 + '"]');
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                obj[ collectionType ] = new SettingsView({
-                       controller: this,
-                       model:      library[ collectionType ],
-                       priority:   40
-               });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( ! $setting.length ) {
+                       return this;
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                attachmentsBrowserView.sidebar.set( obj );
-
-               if ( dragInfoText ) {
-                       attachmentsBrowserView.toolbar.set( 'dragInfo', new wp.media.View({
-                               el: $( '<div class="instructions">' + dragInfoText + '</div>' )[0],
-                               priority: -40
-                       }) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 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;
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add the 'Reverse order' button to the toolbar.
-               attachmentsBrowserView.toolbar.set( 'reverse', {
-                       text:     l10n.reverseOrder,
-                       priority: 80,
-
-                       click: function() {
-                               library.reset( library.toArray().reverse() );
-                       }
-               });
-       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return this.render();
+       };
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-module.exports = CollectionEdit;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Attachment;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-/***/ }),
-/* 36 */
-/***/ (function(module, exports) {
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],26:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * wp.media.controller.CollectionAdd
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * wp.media.view.Attachment.Details
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * A state for adding attachments to a collection (e.g. video playlist).
- *
</del><span class="cx" style="display: block; padding: 0 10px">  * @class
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @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').
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @augments wp.media.view.Attachment
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Selection = wp.media.model.Selection,
-       Library = wp.media.controller.Library,
-       CollectionAdd;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Attachment = wp.media.view.Attachment,
+       l10n = wp.media.view.l10n,
+       Details;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-CollectionAdd = Library.extend({
-       defaults: _.defaults( {
-               // Selection defaults. @see media.model.Selection
-               multiple:      'add',
-               // Attachments browser defaults. @see media.view.AttachmentsBrowser
-               filterable:    'uploaded',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Details = Attachment.extend({
+       tagName:   'div',
+       className: 'attachment-details',
+       template:  wp.template('attachment-details'),
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                priority:      100,
-               syncSelection: false
-       }, Library.prototype.defaults ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ attributes: function() {
+               return {
+                       'tabIndex':     0,
+                       'data-id':      this.model.get( 'id' )
+               };
+       },
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        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();
+               }
+       },
</ins><span class="cx" style="display: block; padding: 0 10px">         /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since 3.9.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param {Object} event
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        initialize: function() {
-               var collectionType = this.get('collectionType');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ deleteAttachment: function( event ) {
+               event.preventDefault();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( 'video' === this.get( 'type' ) ) {
-                       collectionType = 'video-' + collectionType;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( window.confirm( l10n.warnDelete ) ) {
+                       this.model.destroy();
+                       // Keep focus inside media modal
+                       // after image is deleted
+                       this.controller.modal.focusManager.focus();
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        },
+       /**
+        * @param {Object} event
+        */
+       trashAttachment: function( event ) {
+               var library = this.controller.library;
+               event.preventDefault();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.set( 'id', collectionType + '-library' );
-               this.set( 'toolbar', collectionType + '-add' );
-               this.set( 'menu', collectionType );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( wp.media.view.settings.mediaTrash &&
+                       'edit-metadata' === this.controller.content.mode() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 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') }) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.model.set( 'status', 'trash' );
+                       this.model.save().done( function() {
+                               library._requery( true );
+                       } );
+               }  else {
+                       this.model.destroy();
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                Library.prototype.initialize.apply( this, arguments );
</del><span class="cx" style="display: block; padding: 0 10px">         },
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        /**
+        * @param {Object} event
+        */
+       untrashAttachment: function( event ) {
+               var library = this.controller.library;
+               event.preventDefault();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                this.model.set( 'status', 'inherit' );
+               this.model.save().done( function() {
+                       library._requery( true );
+               } );
+       },
</ins><span class="cx" style="display: block; padding: 0 10px">         /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since 3.9.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param {Object} event
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        activate: function() {
-               var library = this.get('library'),
-                       editLibrary = this.get('editLibrary'),
-                       edit = this.frame.state( this.get('collectionType') + '-edit' ).get('library');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editAttachment: function( event ) {
+               var editState = this.controller.states.get( 'edit-image' );
+               if ( window.imageEdit && editState ) {
+                       event.preventDefault();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( editLibrary && editLibrary !== edit ) {
-                       library.unobserve( editLibrary );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 editState.set( 'image', this.model );
+                       this.controller.setState( 'edit-image' );
+               } else {
+                       this.$el.addClass('needs-refresh');
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        },
+       /**
+        * 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;
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 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 );
-               };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( 37 === event.keyCode || 38 === event.keyCode || 39 === event.keyCode || 40 === event.keyCode ) {
+                       this.controller.trigger( 'attachment:keydown:arrow', event );
+                       return;
+               }
+       }
+});
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 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);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Details;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                Library.prototype.activate.apply( this, arguments );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],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
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-module.exports = CollectionAdd;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = EditLibrary;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],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
+       }
+});
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/***/ }),
-/* 37 */
-/***/ (function(module, exports) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = EditSelection;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],29:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * wp.media.controller.FeaturedImage
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * wp.media.view.Attachment.Library
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * A state for selecting a featured image for a post.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @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
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @class
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @augments wp.media.controller.Library
- * @augments wp.media.controller.State
- * @augments Backbone.Model
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @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
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param {object}                     [attributes]                          The attributes hash passed to the state.
- * @param {string}                     [attributes.id=featured-image]        Unique identifier.
- * @param {string}                     [attributes.title=Set Featured Image] 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 images will be created.
- * @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=featured-image]   Initial mode for the toolbar region.
- * @param {int}                        [attributes.priority=60]              The priority for the state link in the media menu.
- * @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.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Attachment = wp.media.model.Attachment,
-       Library = wp.media.controller.Library,
-       l10n = wp.media.view.l10n,
-       FeaturedImage;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var View = wp.media.View,
+       $ = jQuery,
+       Attachments;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-FeaturedImage = Library.extend({
-       defaults: _.defaults({
-               id:            'featured-image',
-               title:         l10n.setFeaturedImageTitle,
-               multiple:      false,
-               filterable:    'uploaded',
-               toolbar:       'featured-image',
-               priority:      60,
-               syncSelection: true
-       }, Library.prototype.defaults ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Attachments = View.extend({
+       tagName:   'ul',
+       className: 'attachments',
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * @since 3.5.0
-        */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ attributes: {
+               tabIndex: -1
+       },
+
</ins><span class="cx" style="display: block; padding: 0 10px">         initialize: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                var library, comparator;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.el.id = _.uniqueId('__attachments-view-');
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // If we haven't been provided a `library`, create a `Selection`.
-               if ( ! this.get('library') ) {
-                       this.set( 'library', wp.media.query({ type: 'image' }) );
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         _.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
+               });
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                Library.prototype.initialize.apply( this, arguments );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this._viewsByCid = {};
+               this.$window = $( window );
+               this.resizeEvent = 'resize.media-modal-columns';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                library    = this.get('library');
-               comparator = library.comparator;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.collection.on( 'add', function( attachment ) {
+                       this.views.add( this.createAttachmentView( attachment ), {
+                               at: this.collection.indexOf( attachment )
+                       });
+               }, this );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Overload the library's comparator to push items that are not in
-               // the mirrored query to the front of the aggregate collection.
-               library.comparator = function( a, b ) {
-                       var aInQuery = !! this.mirroring.get( a.cid ),
-                               bInQuery = !! this.mirroring.get( b.cid );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.collection.on( 'remove', function( attachment ) {
+                       var view = this._viewsByCid[ attachment.cid ];
+                       delete this._viewsByCid[ attachment.cid ];
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( ! aInQuery && bInQuery ) {
-                               return -1;
-                       } else if ( aInQuery && ! bInQuery ) {
-                               return 1;
-                       } else {
-                               return comparator.apply( this, arguments );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( view ) {
+                               view.remove();
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         }, this );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add all items in the selection to the library, so any featured
-               // images that are not initially loaded still appear.
-               library.observe( this.get('selection') );
-       },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.collection.on( 'reset', this.render, this );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * @since 3.5.0
-        */
-       activate: function() {
-               this.updateSelection();
-               this.frame.on( 'open', this.updateSelection, this );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.listenTo( this.controller, 'library:selection:add',    this.attachmentFocus );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                Library.prototype.activate.apply( this, arguments );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 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 );
+               }
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * @since 3.5.0
-        */
-       deactivate: function() {
-               this.frame.off( 'open', this.updateSelection, this );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bindEvents: function() {
+               this.$window.off( this.resizeEvent ).on( this.resizeEvent, _.debounce( this.setColumns, 50 ) );
+       },
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                Library.prototype.deactivate.apply( this, arguments );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ attachmentFocus: function() {
+               this.$( 'li:first' ).focus();
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * @since 3.5.0
-        */
-       updateSelection: function() {
-               var selection = this.get('selection'),
-                       id = wp.media.view.settings.post.featuredImageId,
-                       attachment;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ restoreFocus: function() {
+               this.$( 'li.selected:first' ).focus();
+       },
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( '' !== id && -1 !== id ) {
-                       attachment = Attachment.get( id );
-                       attachment.fetch();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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;
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                selection.reset( attachment ? [ attachment ] : [] );
-       }
-});
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Left arrow
+               if ( 37 === event.keyCode ) {
+                       if ( 0 === index ) {
+                               return;
+                       }
+                       attachments.eq( index - 1 ).focus();
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-module.exports = FeaturedImage;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Up arrow
+               if ( 38 === event.keyCode ) {
+                       if ( 1 === row ) {
+                               return;
+                       }
+                       attachments.eq( index - perRow ).focus();
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // Right arrow
+               if ( 39 === event.keyCode ) {
+                       if ( attachments.length === index ) {
+                               return;
+                       }
+                       attachments.eq( index + 1 ).focus();
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/***/ }),
-/* 38 */
-/***/ (function(module, exports) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Down arrow
+               if ( 40 === event.keyCode ) {
+                       if ( Math.ceil( attachments.length / perRow ) === row ) {
+                               return;
+                       }
+                       attachments.eq( index + perRow ).focus();
+               }
+       },
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/**
- * wp.media.controller.ReplaceImage
- *
- * A state for replacing an image.
- *
- * @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=replace-image]        Unique identifier.
- * @param {string}                     [attributes.title=Replace Image]     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 images will be created.
- * @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=replace]         Initial mode for the toolbar region.
- * @param {int}                        [attributes.priority=60]             The priority for the state link in the media menu.
- * @param {boolean}                    [attributes.searchable=true]         Whether the library is searchable.
- * @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 {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 Library = wp.media.controller.Library,
-       l10n = wp.media.view.l10n,
-       ReplaceImage;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ dispose: function() {
+               this.collection.props.off( null, null, this );
+               if ( this.options.resize ) {
+                       this.$window.off( this.resizeEvent );
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-ReplaceImage = Library.extend({
-       defaults: _.defaults({
-               id:            'replace-image',
-               title:         l10n.replaceImageTitle,
-               multiple:      false,
-               filterable:    'uploaded',
-               toolbar:       'replace',
-               menu:          false,
-               priority:      60,
-               syncSelection: true
-       }, Library.prototype.defaults ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /**
+                * call 'dispose' directly on the parent class
+                */
+               View.prototype.dispose.apply( this, arguments );
+       },
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * @since 3.9.0
-        *
-        * @param options
-        */
-       initialize: function( options ) {
-               var library, comparator;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setColumns: function() {
+               var prev = this.columns,
+                       width = this.$el.width();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.image = options.image;
-               // If we haven't been provided a `library`, create a `Selection`.
-               if ( ! this.get('library') ) {
-                       this.set( 'library', wp.media.query({ type: 'image' }) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         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 );
+                       }
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        },
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                Library.prototype.initialize.apply( this, arguments );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ initSortable: function() {
+               var collection = this.collection;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                library    = this.get('library');
-               comparator = library.comparator;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( wp.media.isTouchDevice || ! this.options.sortable || ! $.fn.sortable ) {
+                       return;
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Overload the library's comparator to push items that are not in
-               // the mirrored query to the front of the aggregate collection.
-               library.comparator = function( a, b ) {
-                       var aInQuery = !! this.mirroring.get( a.cid ),
-                               bInQuery = !! this.mirroring.get( b.cid );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.$el.sortable( _.extend({
+                       // If the `collection` has a `comparator`, disable sorting.
+                       disabled: !! collection.comparator,
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( ! aInQuery && bInQuery ) {
-                               return -1;
-                       } else if ( aInQuery && ! bInQuery ) {
-                               return 1;
-                       } else {
-                               return comparator.apply( this, arguments );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 // 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();
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         }, this.options.sortable ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Add all items in the selection to the library, so any featured
-               // images that are not initially loaded still appear.
-               library.observe( this.get('selection') );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 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();
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * @since 3.9.0
-        */
-       activate: function() {
-               this.updateSelection();
-               Library.prototype.activate.apply( this, arguments );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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 );
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since 3.9.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param {wp.media.model.Attachment} attachment
+        * @returns {wp.media.View}
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        updateSelection: function() {
-               var selection = this.get('selection'),
-                       attachment = this.image.attachment;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ createAttachmentView: function( attachment ) {
+               var view = new this.options.AttachmentView({
+                       controller:           this.controller,
+                       model:                attachment,
+                       collection:           this.collection,
+                       selection:            this.options.selection
+               });
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                selection.reset( attachment ? [ attachment ] : [] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         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();
+                       });
+               }
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-module.exports = ReplaceImage;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Attachments;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-/***/ }),
-/* 39 */
-/***/ (function(module, exports) {
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],32:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * wp.media.controller.EditImage
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * wp.media.view.AttachmentsBrowser
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * A state for editing (cropping, etc.) an image.
- *
</del><span class="cx" style="display: block; padding: 0 10px">  * @class
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @augments wp.media.controller.State
- * @augments Backbone.Model
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @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.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param {object}         [options]               The options hash passed to the view.
+ * @param {boolean|string} [options.filters=false] Which filters to show in the browser's toolbar.
+ *                                                 Accepts 'uploaded' and 'all'.
+ * @param {boolean}        [options.search=true]   Whether to show the search interface in the
+ *                                                 browser's toolbar.
+ * @param {boolean}        [options.date=true]     Whether to show the date filter in the
+ *                                                 browser's toolbar.
+ * @param {boolean}        [options.display=false] Whether to show the attachments display settings
+ *                                                 view in the sidebar.
+ * @param {boolean|string} [options.sidebar=true]  Whether to create a sidebar for the browser.
+ *                                                 Accepts true, false, and 'errors'.
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var l10n = wp.media.view.l10n,
-       EditImage;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var View = wp.media.View,
+       mediaTrash = wp.media.view.settings.mediaTrash,
+       l10n = wp.media.view.l10n,
+       $ = jQuery,
+       AttachmentsBrowser;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-EditImage = wp.media.controller.State.extend({
-       defaults: {
-               id:      'edit-image',
-               title:   l10n.editImage,
-               menu:    false,
-               toolbar: 'edit-image',
-               content: 'edit-image',
-               url:     ''
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+AttachmentsBrowser = View.extend({
+       tagName:   'div',
+       className: 'attachments-browser',
+
+       initialize: function() {
+               _.defaults( this.options, {
+                       filters: false,
+                       search:  true,
+                       date:    true,
+                       display: false,
+                       sidebar: true,
+                       AttachmentView: wp.media.view.Attachment.Library
+               });
+
+               this.listenTo( this.controller, 'toggle:upload:attachment', _.bind( this.toggleUploader, this ) );
+               this.controller.on( 'edit:selection', this.editSelection );
+               this.createToolbar();
+               if ( this.options.sidebar ) {
+                       this.createSidebar();
+               }
+               this.createUploader();
+               this.createAttachments();
+               this.updateContent();
+
+               if ( ! this.options.sidebar || 'errors' === this.options.sidebar ) {
+                       this.$el.addClass( 'hide-sidebar' );
+
+                       if ( 'errors' === this.options.sidebar ) {
+                               this.$el.addClass( 'sidebar-for-errors' );
+                       }
+               }
+
+               this.collection.on( 'add remove reset', this.updateContent, this );
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * @since 3.9.0
-        */
-       activate: function() {
-               this.listenTo( this.frame, 'toolbar:render:edit-image', this.toolbar );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editSelection: function( modal ) {
+               modal.$( '.media-button-backToLibrary' ).focus();
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since 3.9.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @returns {wp.media.view.AttachmentsBrowser} Returns itself to allow chaining
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        deactivate: function() {
-               this.stopListening( this.frame );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ dispose: function() {
+               this.options.selection.off( null, null, this );
+               View.prototype.dispose.apply( this, arguments );
+               return this;
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * @since 3.9.0
-        */
-       toolbar: function() {
-               var frame = this.frame,
-                       lastState = frame.lastState(),
-                       previous = lastState && lastState.id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ createToolbar: function() {
+               var LibraryViewSwitcher, Filters, toolbarOptions;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                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 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         toolbarOptions = {
+                       controller: this.controller
+               };
+
+               if ( this.controller.isModeActive( 'grid' ) ) {
+                       toolbarOptions.className = 'media-toolbar wp-filter';
+               }
+
+               /**
+               * @member {wp.media.view.Toolbar}
+               */
+               this.toolbar = new wp.media.view.Toolbar( toolbarOptions );
+
+               this.views.add( this.toolbar );
+
+               this.toolbar.set( 'spinner', new wp.media.view.Spinner({
+                       priority: -60
+               }) );
+
+               if ( -1 !== $.inArray( this.options.filters, [ 'uploaded', 'all' ] ) ) {
+                       // "Filters" will return a <select>, need to render
+                       // screen reader text before
+                       this.toolbar.set( 'filtersLabel', new wp.media.view.Label({
+                               value: l10n.filterByType,
+                               attributes: {
+                                       'for':  'media-attachment-filters'
+                               },
+                               priority:   -80
+                       }).render() );
+
+                       if ( 'uploaded' === this.options.filters ) {
+                               this.toolbar.set( 'filters', new wp.media.view.AttachmentFilters.Uploaded({
+                                       controller: this.controller,
+                                       model:      this.collection.props,
+                                       priority:   -80
+                               }).render() );
+                       } else {
+                               Filters = new wp.media.view.AttachmentFilters.All({
+                                       controller: this.controller,
+                                       model:      this.collection.props,
+                                       priority:   -80
+                               });
+
+                               this.toolbar.set( 'filters', Filters.render() );
+                       }
+               }
+
+               // Feels odd to bring the global media library switcher into the Attachment
+               // browser view. Is this a use case for doAction( 'add:toolbar-items:attachments-browser', this.toolbar );
+               // which the controller can tap into and add this view?
+               if ( this.controller.isModeActive( 'grid' ) ) {
+                       LibraryViewSwitcher = View.extend({
+                               className: 'view-switch media-grid-view-switch',
+                               template: wp.template( 'media-library-view-switcher')
+                       });
+
+                       this.toolbar.set( 'libraryViewSwitcher', new LibraryViewSwitcher({
+                               controller: this.controller,
+                               priority: -90
+                       }).render() );
+
+                       // DateFilter is a <select>, screen reader text needs to be rendered before
+                       this.toolbar.set( 'dateFilterLabel', new wp.media.view.Label({
+                               value: l10n.filterByDate,
+                               attributes: {
+                                       'for': 'media-attachment-date-filters'
+                               },
+                               priority: -75
+                       }).render() );
+                       this.toolbar.set( 'dateFilter', new wp.media.view.DateFilter({
+                               controller: this.controller,
+                               model:      this.collection.props,
+                               priority: -75
+                       }).render() );
+
+                       // BulkSelection is a <div> with subviews, including screen reader text
+                       this.toolbar.set( 'selectModeToggleButton', new wp.media.view.SelectModeToggleButton({
+                               text: l10n.bulkSelect,
+                               controller: this.controller,
+                               priority: -70
+                       }).render() );
+
+                       this.toolbar.set( 'deleteSelectedButton', new wp.media.view.DeleteSelectedButton({
+                               filters: Filters,
+                               style: 'primary',
+                               disabled: true,
+                               text: mediaTrash ? l10n.trashSelected : l10n.deleteSelected,
+                               controller: this.controller,
+                               priority: -60,
+                               click: function() {
+                                       var changed = [], removed = [],
+                                               selection = this.controller.state().get( 'selection' ),
+                                               library = this.controller.state().get( 'library' );
+
+                                       if ( ! selection.length ) {
+                                               return;
+                                       }
+
+                                       if ( ! mediaTrash && ! window.confirm( l10n.warnBulkDelete ) ) {
+                                               return;
+                                       }
+
+                                       if ( mediaTrash &&
+                                               'trash' !== selection.at( 0 ).get( 'status' ) &&
+                                               ! window.confirm( l10n.warnBulkTrash ) ) {
+
+                                               return;
+                                       }
+
+                                       selection.each( function( model ) {
+                                               if ( ! model.get( 'nonces' )['delete'] ) {
+                                                       removed.push( model );
+                                                       return;
+                                               }
+
+                                               if ( mediaTrash && 'trash' === model.get( 'status' ) ) {
+                                                       model.set( 'status', 'inherit' );
+                                                       changed.push( model.save() );
+                                                       removed.push( model );
+                                               } else if ( mediaTrash ) {
+                                                       model.set( 'status', 'trash' );
+                                                       changed.push( model.save() );
+                                                       removed.push( model );
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        frame.close();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 model.destroy({wait: true});
</ins><span class="cx" style="display: block; padding: 0 10px">                                                 }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                        } );
+
+                                       if ( changed.length ) {
+                                               selection.remove( removed );
+
+                                               $.when.apply( null, changed ).then( _.bind( function() {
+                                                       library._requery( true );
+                                                       this.controller.trigger( 'selection:action:done' );
+                                               }, this ) );
+                                       } else {
+                                               this.controller.trigger( 'selection:action:done' );
</ins><span class="cx" style="display: block; padding: 0 10px">                                         }
</span><span class="cx" style="display: block; padding: 0 10px">                                }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        }).render() );
+
+                       if ( mediaTrash ) {
+                               this.toolbar.set( 'deleteSelectedPermanentlyButton', new wp.media.view.DeleteSelectedPermanentlyButton({
+                                       filters: Filters,
+                                       style: 'primary',
+                                       disabled: true,
+                                       text: l10n.deleteSelected,
+                                       controller: this.controller,
+                                       priority: -55,
+                                       click: function() {
+                                               var removed = [], selection = this.controller.state().get( 'selection' );
+
+                                               if ( ! selection.length || ! window.confirm( l10n.warnBulkDelete ) ) {
+                                                       return;
+                                               }
+
+                                               selection.each( function( model ) {
+                                                       if ( ! model.get( 'nonces' )['delete'] ) {
+                                                               removed.push( model );
+                                                               return;
+                                                       }
+
+                                                       model.destroy();
+                                               } );
+
+                                               selection.remove( removed );
+                                               this.controller.trigger( 'selection:action:done' );
+                                       }
+                               }).render() );
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+               } else if ( this.options.date ) {
+                       // DateFilter is a <select>, screen reader text needs to be rendered before
+                       this.toolbar.set( 'dateFilterLabel', new wp.media.view.Label({
+                               value: l10n.filterByDate,
+                               attributes: {
+                                       'for': 'media-attachment-date-filters'
+                               },
+                               priority: -75
+                       }).render() );
+                       this.toolbar.set( 'dateFilter', new wp.media.view.DateFilter({
+                               controller: this.controller,
+                               model:      this.collection.props,
+                               priority: -75
+                       }).render() );
+               }
+
+               if ( this.options.search ) {
+                       // Search is an input, screen reader text needs to be rendered before
+                       this.toolbar.set( 'searchLabel', new wp.media.view.Label({
+                               value: l10n.searchMediaLabel,
+                               attributes: {
+                                       'for': 'media-search-input'
+                               },
+                               priority:   60
+                       }).render() );
+                       this.toolbar.set( 'search', new wp.media.view.Search({
+                               controller: this.controller,
+                               model:      this.collection.props,
+                               priority:   60
+                       }).render() );
+               }
+
+               if ( this.options.dragInfo ) {
+                       this.toolbar.set( 'dragInfo', new View({
+                               el: $( '<div class="instructions">' + l10n.dragInfo + '</div>' )[0],
+                               priority: -40
+                       }) );
+               }
+
+               if ( this.options.suggestedWidth && this.options.suggestedHeight ) {
+                       this.toolbar.set( 'suggestedDimensions', new View({
+                               el: $( '<div class="instructions">' + l10n.suggestedDimensions + ' ' + this.options.suggestedWidth + ' &times; ' + this.options.suggestedHeight + '</div>' )[0],
+                               priority: -40
+                       }) );
+               }
+       },
+
+       updateContent: function() {
+               var view = this,
+                       noItemsView;
+
+               if ( this.controller.isModeActive( 'grid' ) ) {
+                       noItemsView = view.attachmentsNoResults;
+               } else {
+                       noItemsView = view.uploader;
+               }
+
+               if ( ! this.collection.length ) {
+                       this.toolbar.get( 'spinner' ).show();
+                       this.dfd = this.collection.more().done( function() {
+                               if ( ! view.collection.length ) {
+                                       noItemsView.$el.removeClass( 'hidden' );
+                               } else {
+                                       noItemsView.$el.addClass( 'hidden' );
+                               }
+                               view.toolbar.get( 'spinner' ).hide();
+                       } );
+               } else {
+                       noItemsView.$el.addClass( 'hidden' );
+                       view.toolbar.get( 'spinner' ).hide();
+               }
+       },
+
+       createUploader: function() {
+               this.uploader = new wp.media.view.UploaderInline({
+                       controller: this.controller,
+                       status:     false,
+                       message:    this.controller.isModeActive( 'grid' ) ? '' : l10n.noItemsFound,
+                       canClose:   this.controller.isModeActive( 'grid' )
+               });
+
+               this.uploader.hide();
+               this.views.add( this.uploader );
+       },
+
+       toggleUploader: function() {
+               if ( this.uploader.$el.hasClass( 'hidden' ) ) {
+                       this.uploader.show();
+               } else {
+                       this.uploader.hide();
+               }
+       },
+
+       createAttachments: function() {
+               this.attachments = new wp.media.view.Attachments({
+                       controller:           this.controller,
+                       collection:           this.collection,
+                       selection:            this.options.selection,
+                       model:                this.model,
+                       sortable:             this.options.sortable,
+                       scrollElement:        this.options.scrollElement,
+                       idealColumnWidth:     this.options.idealColumnWidth,
+
+                       // The single `Attachment` view to be used in the `Attachments` view.
+                       AttachmentView: this.options.AttachmentView
+               });
+
+               // Add keydown listener to the instance of the Attachments view
+               this.attachments.listenTo( this.controller, 'attachment:keydown:arrow',     this.attachments.arrowEvent );
+               this.attachments.listenTo( this.controller, 'attachment:details:shift-tab', this.attachments.restoreFocus );
+
+               this.views.add( this.attachments );
+
+
+               if ( this.controller.isModeActive( 'grid' ) ) {
+                       this.attachmentsNoResults = new View({
+                               controller: this.controller,
+                               tagName: 'p'
+                       });
+
+                       this.attachmentsNoResults.$el.addClass( 'hidden no-media' );
+                       this.attachmentsNoResults.$el.html( l10n.noMedia );
+
+                       this.views.add( this.attachmentsNoResults );
+               }
+       },
+
+       createSidebar: function() {
+               var options = this.options,
+                       selection = options.selection,
+                       sidebar = this.sidebar = new wp.media.view.Sidebar({
+                               controller: this.controller
+                       });
+
+               this.views.add( sidebar );
+
+               if ( this.controller.uploader ) {
+                       sidebar.set( 'uploads', new wp.media.view.UploaderStatus({
+                               controller: this.controller,
+                               priority:   40
+                       }) );
+               }
+
+               selection.on( 'selection:single', this.createSingle, this );
+               selection.on( 'selection:unsingle', this.disposeSingle, this );
+
+               if ( selection.single() ) {
+                       this.createSingle();
+               }
+       },
+
+       createSingle: function() {
+               var sidebar = this.sidebar,
+                       single = this.options.selection.single();
+
+               sidebar.set( 'details', new wp.media.view.Attachment.Details({
+                       controller: this.controller,
+                       model:      single,
+                       priority:   80
</ins><span class="cx" style="display: block; padding: 0 10px">                 }) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+               sidebar.set( 'compat', new wp.media.view.AttachmentCompat({
+                       controller: this.controller,
+                       model:      single,
+                       priority:   120
+               }) );
+
+               if ( this.options.display ) {
+                       sidebar.set( 'display', new wp.media.view.Settings.AttachmentDisplay({
+                               controller:   this.controller,
+                               model:        this.model.display( single ),
+                               attachment:   single,
+                               priority:     160,
+                               userSettings: this.model.get('displayUserSettings')
+                       }) );
+               }
+
+               // Show the sidebar on mobile
+               if ( this.model.id === 'insert' ) {
+                       sidebar.$el.addClass( 'visible' );
+               }
+       },
+
+       disposeSingle: function() {
+               var sidebar = this.sidebar;
+               sidebar.unset('details');
+               sidebar.unset('compat');
+               sidebar.unset('display');
+               // Hide the sidebar on mobile
+               sidebar.$el.removeClass( 'visible' );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-module.exports = EditImage;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = AttachmentsBrowser;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],33:[function(require,module,exports){
+/**
+ * wp.media.view.Attachments.Selection
+ *
+ * @class
+ * @augments wp.media.view.Attachments
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Attachments = wp.media.view.Attachments,
+       Selection;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/***/ }),
-/* 40 */
-/***/ (function(module, exports) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Selection = Attachments.extend({
+       events: {},
+       initialize: function() {
+               _.defaults( this.options, {
+                       sortable:   false,
+                       resize:     false,
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        // The single `Attachment` view to be used in the `Attachments` view.
+                       AttachmentView: wp.media.view.Attachment.Selection
+               });
+               // Call 'initialize' directly on the parent class.
+               return Attachments.prototype.initialize.apply( this, arguments );
+       }
+});
+
+module.exports = Selection;
+
+},{}],34:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * wp.media.controller.MediaLibrary
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * wp.media.view.ButtonGroup
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @class
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @augments wp.media.controller.Library
- * @augments wp.media.controller.State
- * @augments Backbone.Model
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Library = wp.media.controller.Library,
-       MediaLibrary;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var $ = Backbone.$,
+       ButtonGroup;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-MediaLibrary = Library.extend({
-       defaults: _.defaults({
-               // Attachments browser defaults. @see media.view.AttachmentsBrowser
-               filterable:      'uploaded',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ButtonGroup = wp.media.View.extend({
+       tagName:   'div',
+       className: 'button-group button-large media-button-group',
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                displaySettings: false,
-               priority:        80,
-               syncSelection:   false
-       }, Library.prototype.defaults ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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();
+                       }
+               });
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * @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 }) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         delete this.options.buttons;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                Library.prototype.initialize.apply( this, arguments );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( this.options.classes ) {
+                       this.$el.addClass( this.options.classes );
+               }
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @since 3.9.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @returns {wp.media.view.ButtonGroup}
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        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 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ render: function() {
+               this.$el.html( $( _.pluck( this.buttons, 'el' ) ).detach() );
+               return this;
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-module.exports = MediaLibrary;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = ButtonGroup;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-/***/ }),
-/* 41 */
-/***/ (function(module, exports) {
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],35:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * wp.media.controller.Embed
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * wp.media.view.Button
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * A state for embedding media from a URL.
- *
</del><span class="cx" style="display: block; padding: 0 10px">  * @class
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @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.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var l10n = wp.media.view.l10n,
-       $ = Backbone.$,
-       Embed;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Button = wp.media.View.extend({
+       tagName:    'button',
+       className:  'media-button',
+       attributes: { type: 'button' },
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Embed = wp.media.controller.State.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ events: {
+               'click': 'click'
+       },
+
</ins><span class="cx" style="display: block; padding: 0 10px">         defaults: {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                id:       'embed',
-               title:    l10n.insertFromUrlTitle,
-               content:  'embed',
-               menu:     'default',
-               toolbar:  'main-embed',
-               priority: 120,
-               type:     'link',
-               url:      '',
-               metadata: {}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         text:     '',
+               style:    '',
+               size:     'large',
+               disabled: false
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // The amount of time used when debouncing the scan.
-       sensitivity: 400,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ initialize: function() {
+               /**
+                * Create a model with the provided `defaults`.
+                *
+                * @member {Backbone.Model}
+                */
+               this.model = new Backbone.Model( this.defaults );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        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 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 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 );
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">         /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Trigger a scan of the embedded URL's content for metadata required to embed.
-        *
-        * @fires wp.media.controller.Embed#scan
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @returns {wp.media.view.Button} Returns itself to allow chaining
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        scan: function() {
-               var scanners,
-                       embed = this,
-                       attributes = {
-                               type: 'link',
-                               scanners: []
-                       };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ render: function() {
+               var classes = [ 'button', this.className ],
+                       model = this.model.toJSON();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 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 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( model.style ) {
+                       classes.push( 'button-' + model.style );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                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;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( model.size ) {
+                       classes.push( 'button-' + model.size );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                attributes.loading = !! attributes.scanners;
-               this.set( attributes );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         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;
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Try scanning the embed as an image to discover its dimensions.
-        *
-        * @param {Object} attributes
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param {Object} event
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        scanImage: function( attributes ) {
-               var frame = this.frame,
-                       state = this,
-                       url = this.props.get('url'),
-                       image = new Image(),
-                       deferred = $.Deferred();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ click: function( event ) {
+               if ( '#' === this.attributes.href ) {
+                       event.preventDefault();
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                attributes.scanners.push( deferred.promise() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( this.options.click && ! this.model.get('disabled') ) {
+                       this.options.click.apply( this, arguments );
+               }
+       }
+});
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Try to load the image and find its width/height.
-               image.onload = function() {
-                       deferred.resolve();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Button;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( state !== frame.state() || url !== state.props.get('url') ) {
-                               return;
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],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.
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var View = wp.media.View,
+       UploaderStatus = wp.media.view.UploaderStatus,
+       l10n = wp.media.view.l10n,
+       $ = jQuery,
+       Cropper;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        state.set({
-                               type: 'image'
-                       });
-
-                       state.props.set({
-                               width:  image.width,
-                               height: image.height
-                       });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Cropper = View.extend({
+       className: 'crop-content',
+       template: wp.template('crop-content'),
+       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);
+       },
+       prepare: function() {
+               return {
+                       title: l10n.cropYourImage,
+                       url: this.options.attachment.get('url')
</ins><span class="cx" style="display: block; padding: 0 10px">                 };
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-               image.onerror = deferred.reject;
-               image.src = url;
</del><span class="cx" style="display: block; padding: 0 10px">         },
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        onImageLoad: function() {
+               var imgOptions = this.controller.get('imgSelectOptions');
+               if (typeof imgOptions === 'function') {
+                       imgOptions = imgOptions(this.options.attachment, this.controller);
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        refresh: function() {
-               this.frame.toolbar.get().refresh();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         imgOptions = _.extend(imgOptions, {parent: this.$el});
+               this.trigger('image-loaded');
+               this.controller.imgSelect = this.$image.imgAreaSelect(imgOptions);
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        onError: function() {
+               var filename = this.options.attachment.get('filename');
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        reset: function() {
-               this.props.clear().set({ url: '' });
-
-               if ( this.active ) {
-                       this.refresh();
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.views.add( '.upload-errors', new wp.media.view.UploaderStatusError({
+                       filename: UploaderStatus.prototype.filename(filename),
+                       message: window._wpMediaViewsL10n.cropError
+               }), { at: 0 });
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-module.exports = Embed;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Cropper;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-/***/ }),
-/* 42 */
-/***/ (function(module, exports) {
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],37:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * wp.media.controller.Cropper
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * wp.media.view.EditImage
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * A state for cropping an image.
- *
</del><span class="cx" style="display: block; padding: 0 10px">  * @class
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @augments wp.media.controller.State
- * @augments Backbone.Model
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var l10n = wp.media.view.l10n,
-       Cropper;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var View = wp.media.View,
+       EditImage;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Cropper = wp.media.controller.State.extend({
-       defaults: {
-               id:          'cropper',
-               title:       l10n.cropImage,
-               // Region mode defaults.
-               toolbar:     'crop',
-               content:     'crop',
-               router:      false,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+EditImage = View.extend({
+       className: 'image-editor',
+       template: wp.template('image-editor'),
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                canSkipCrop: false
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ initialize: function( options ) {
+               this.editor = window.imageEdit;
+               this.controller = options.controller;
+               View.prototype.initialize.apply( this, arguments );
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        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));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ prepare: function() {
+               return this.model.toJSON();
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        deactivate: function() {
-               this.frame.toolbar.mode('browse');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ loadEditor: function() {
+               var dfd = this.editor.open( this.model.get('id'), this.model.get('nonces').edit, this );
+               dfd.done( _.bind( this.focus, this ) );
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        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);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ focus: function() {
+               this.$( '.imgedit-submit .button' ).eq( 0 ).focus();
+       },
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        back: function() {
+               var lastState = this.controller.lastState();
+               this.controller.setState( lastState );
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        removeCropper: function() {
-               this.imgSelect.cancelSelection();
-               this.imgSelect.setOptions({remove: true});
-               this.imgSelect.update();
-               this.cropperView.remove();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+       refresh: function() {
+               this.model.fetch();
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        createCropToolbar: function() {
-               var canSkipCrop, toolbarOptions;
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                canSkipCrop = this.get('canSkipCrop') || false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ save: function() {
+               var lastState = this.controller.lastState();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                toolbarOptions = {
-                       controller: this.frame,
-                       items: {
-                               insert: {
-                                       style:    'primary',
-                                       text:     l10n.cropImage,
-                                       priority: 80,
-                                       requires: { library: false, selection: false },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.model.fetch().done( _.bind( function() {
+                       this.controller.setState( lastState );
+               }, this ) );
+       }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        click: function() {
-                                               var controller = this.controller,
-                                                       selection;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+});
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                selection = controller.state().get('selection').first();
-                                               selection.set({cropDetails: controller.state().imgSelect.getSelection()});
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = EditImage;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                this.$el.text(l10n.cropping);
-                                               this.$el.attr('disabled', true);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],38:[function(require,module,exports){
+/**
+ * wp.media.view.Embed
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Embed = wp.media.View.extend({
+       className: 'media-embed',
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                controller.state().doCrop( selection ).done( function( croppedImage ) {
-                                                       controller.trigger('cropped', croppedImage );
-                                                       controller.close();
-                                               }).fail( function() {
-                                                       controller.trigger('content:error:crop');
-                                               });
-                                       }
-                               }
-                       }
-               };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ initialize: function() {
+               /**
+                * @member {wp.media.view.EmbedUrl}
+                */
+               this.url = new wp.media.view.EmbedUrl({
+                       controller: this.controller,
+                       model:      this.model.props
+               }).render();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                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();
-                                       }
-                               }
-                       });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.views.set([ this.url ]);
+               this.refresh();
+               this.listenTo( this.model, 'change:type', this.refresh );
+               this.listenTo( this.model, 'change:loading', this.loading );
+       },
+
+       /**
+        * @param {Object} view
+        */
+       settings: function( view ) {
+               if ( this._settings ) {
+                       this._settings.remove();
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                this._settings = view;
+               this.views.add( view );
+       },
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.frame.toolbar.set( new wp.media.view.Toolbar(toolbarOptions) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ refresh: function() {
+               var type = this.model.get('type'),
+                       constructor;
+
+               if ( 'image' === type ) {
+                       constructor = wp.media.view.EmbedImage;
+               } else if ( 'link' === type ) {
+                       constructor = wp.media.view.EmbedLink;
+               } else {
+                       return;
+               }
+
+               this.settings( new constructor({
+                       controller: this.controller,
+                       model:      this.model.props,
+                       priority:   40
+               }) );
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        doCrop: function( attachment ) {
-               return wp.ajax.post( 'custom-header-crop', {
-                       nonce: attachment.get('nonces').edit,
-                       id: attachment.get('id'),
-                       cropDetails: attachment.get('cropDetails')
-               } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ loading: function() {
+               this.$el.toggleClass( 'embed-loading', this.model.get('loading') );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-module.exports = Cropper;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Embed;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-/***/ }),
-/* 43 */
-/***/ (function(module, exports) {
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],39:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * wp.media.controller.CustomizeImageCropper
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * wp.media.view.EmbedImage
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * A state for cropping an image.
- *
</del><span class="cx" style="display: block; padding: 0 10px">  * @class
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @augments wp.media.controller.Cropper
- * @augments wp.media.controller.State
- * @augments Backbone.Model
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @augments wp.media.view.Settings.AttachmentDisplay
+ * @augments wp.media.view.Settings
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Controller = wp.media.controller,
-       CustomizeImageCropper;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var AttachmentDisplay = wp.media.view.Settings.AttachmentDisplay,
+       EmbedImage;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-CustomizeImageCropper = Controller.Cropper.extend({
-       doCrop: function( attachment ) {
-               var cropDetails = attachment.get( 'cropDetails' ),
-                       control = this.get( 'control' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+EmbedImage = AttachmentDisplay.extend({
+       className: 'embed-media-settings',
+       template:  wp.template('embed-image-settings'),
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                cropDetails.dst_width  = control.params.width;
-               cropDetails.dst_height = control.params.height;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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 );
+       },
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return wp.ajax.post( 'crop-image', {
-                       wp_customize: 'on',
-                       nonce: attachment.get( 'nonces' ).edit,
-                       id: attachment.get( 'id' ),
-                       context: control.id,
-                       cropDetails: cropDetails
-               } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ updateImage: function() {
+               this.$('img').attr( 'src', this.model.get('url') );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-module.exports = CustomizeImageCropper;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = EmbedImage;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-/***/ }),
-/* 44 */
-/***/ (function(module, exports) {
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],40:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * wp.media.controller.SiteIconCropper
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * wp.media.view.EmbedLink
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * A state for cropping a Site Icon.
- *
</del><span class="cx" style="display: block; padding: 0 10px">  * @class
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @augments wp.media.controller.Cropper
- * @augments wp.media.controller.State
- * @augments Backbone.Model
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @augments wp.media.view.Settings
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
</ins><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Controller = wp.media.controller,
-       SiteIconCropper;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var $ = jQuery,
+       EmbedLink;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-SiteIconCropper = Controller.Cropper.extend({
-       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));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+EmbedLink = wp.media.view.Settings.extend({
+       className: 'embed-link-settings',
+       template:  wp.template('embed-link-settings'),
+
+       initialize: function() {
+               this.listenTo( this.model, 'change:url', this.updateoEmbed );
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        createCropContent: function() {
-               this.cropperView = new wp.media.view.SiteIconCropper({
-                       controller: this,
-                       attachment: this.get('selection').first()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ updateoEmbed: _.debounce( function() {
+               var url = this.model.get( 'url' );
+
+               // clear out previous results
+               this.$('.embed-container').hide().find('.embed-preview').empty();
+               this.$( '.setting' ).hide();
+
+               // only proceed with embed if the field contains more than 11 characters
+               // Example: http://a.io is 11 chars
+               if ( url && ( url.length < 11 || ! url.match(/^http(s)?:\/\//) ) ) {
+                       return;
+               }
+
+               this.fetch();
+       }, wp.media.controller.Embed.sensitivity ),
+
+       fetch: function() {
+               var embed;
+
+               // check if they haven't typed in 500 ms
+               if ( $('#embed-url-field').val() !== this.model.get('url') ) {
+                       return;
+               }
+
+               if ( this.dfd && 'pending' === this.dfd.state() ) {
+                       this.dfd.abort();
+               }
+
+               embed = new wp.shortcode({
+                       tag: 'embed',
+                       attrs: _.pick( this.model.attributes, [ 'width', 'height', 'src' ] ),
+                       content: this.model.get('url')
</ins><span class="cx" style="display: block; padding: 0 10px">                 });
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.cropperView.on('image-loaded', this.createCropToolbar, this);
-               this.frame.content.set(this.cropperView);
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                this.dfd = $.ajax({
+                       type:    'POST',
+                       url:     wp.ajax.settings.url,
+                       context: this,
+                       data:    {
+                               action: 'parse-embed',
+                               post_ID: wp.media.view.settings.post.id,
+                               shortcode: embed.string()
+                       }
+               })
+                       .done( this.renderoEmbed )
+                       .fail( this.renderFail );
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        doCrop: function( attachment ) {
-               var cropDetails = attachment.get( 'cropDetails' ),
-                       control = this.get( 'control' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ renderFail: function ( response, status ) {
+               if ( 'abort' === status ) {
+                       return;
+               }
+               this.$( '.link-text' ).show();
+       },
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                cropDetails.dst_width  = control.params.width;
-               cropDetails.dst_height = control.params.height;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ renderoEmbed: function( response ) {
+               var html = ( response && response.data && response.data.body ) || '';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return wp.ajax.post( 'crop-image', {
-                       nonce: attachment.get( 'nonces' ).edit,
-                       id: attachment.get( 'id' ),
-                       context: 'site-icon',
-                       cropDetails: cropDetails
-               } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( html ) {
+                       this.$('.embed-container').show().find('.embed-preview').html( html );
+               } else {
+                       this.renderFail();
+               }
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-module.exports = SiteIconCropper;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = EmbedLink;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-/***/ }),
-/* 45 */
-/***/ (function(module, exports) {
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],41:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * wp.media.View
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * wp.media.view.EmbedUrl
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * 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.
- *
</del><span class="cx" style="display: block; padding: 0 10px">  * @class
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @augments wp.media.View
</ins><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = wp.Backbone.View.extend({
-       constructor: function( options ) {
-               if ( options && options.controller ) {
-                       this.controller = options.controller;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+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 );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                wp.Backbone.View.apply( this, arguments );
</del><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @returns {wp.media.view.EmbedUrl} Returns itself to allow chaining
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        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();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ render: function() {
+               var $input = this.$input;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( this.model && this.model.off ) {
-                       this.model.off( null, null, this );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( $input.is(':focus') ) {
+                       return;
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( this.collection && this.collection.off ) {
-                       this.collection.off( null, null, this );
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         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;
+       },
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Unbind controller events.
-               if ( this.controller && this.controller.off ) {
-                       this.controller.off( null, null, this );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ready: function() {
+               if ( ! wp.media.isTouchDevice ) {
+                       this.focus();
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        },
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return this;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ url: function( event ) {
+               this.model.set( 'url', event.target.value );
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px">         /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @returns {wp.media.View} Returns itself to allow chaining
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * If the input is visible, focus and select its contents.
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        remove: function() {
-               this.dispose();
-               /**
-                * call 'remove' directly on the parent class
-                */
-               return wp.Backbone.View.prototype.remove.apply( this, arguments );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ focus: function() {
+               var $input = this.$input;
+               if ( $input.is(':visible') ) {
+                       $input.focus()[0].select();
+               }
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-module.exports = View;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = EmbedUrl;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],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({
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/***/ }),
-/* 46 */
-/***/ (function(module, exports) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ events: {
+               'keydown': 'constrainTabbing'
+       },
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        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){
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * wp.media.view.Frame
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2660,17 +4898,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Frame;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-/***/ }),
-/* 47 */
-/***/ (function(module, exports) {
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],44:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * wp.media.view.MediaFrame
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * wp.media.view.MediaFrame.ImageDetails
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The frame used to create the media modal.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * A media frame for manipulating an image that's already been inserted
+ * into a post.
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @class
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @augments wp.media.view.MediaFrame.Select
+ * @augments wp.media.view.MediaFrame
</ins><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.media.view.Frame
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.media.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2677,420 +4914,168 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @mixes wp.media.controller.StateMachine
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Frame = wp.media.view.Frame,
-       $ = jQuery,
-       MediaFrame;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Select = wp.media.view.MediaFrame.Select,
+       l10n = wp.media.view.l10n,
+       ImageDetails;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-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'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ImageDetails = Select.extend({
+       defaults: {
+               id:      'image',
+               url:     '',
+               menu:    'image-details',
+               content: 'image-details',
+               toolbar: 'image-details',
+               type:    'link',
+               title:    l10n.imageDetailsTitle,
+               priority: 120
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * @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 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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 );
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * @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
-               });
-       },
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        toggleMenu: function() {
-               this.$el.find( '.media-menu' ).toggleClass( 'visible' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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 );
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * @param {Object} toolbar
-        * @this wp.media.controller.Region
-        */
-       createToolbar: function( toolbar ) {
-               toolbar.view = new wp.media.view.Toolbar({
-                       controller: this
-               });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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
+                       } )
+               ]);
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * @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;
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ imageDetailsContent: function( options ) {
+               options.view = new wp.media.view.ImageDetails({
+                       controller: this,
+                       model: this.state().image,
+                       attachment: this.state().image.attachment
</ins><span class="cx" style="display: block; padding: 0 10px">                 });
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        iframeContentCleanup: function() {
-               this.$el.removeClass('hide-toolbar');
-       },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editImageContent: function() {
+               var state = this.state(),
+                       model = state.get('image'),
+                       view;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        iframeMenu: function( view ) {
-               var views = {};
-
-               if ( ! view ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( ! model ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         return;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                _.each( wp.media.view.settings.tabs, function( title, id ) {
-                       views[ 'iframe:' + id ] = {
-                               text: this.state( 'iframe:' + id ).get('title'),
-                               priority: 200
-                       };
-               }, this );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         view = new wp.media.view.EditImage( { model: model, controller: this } ).render();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                view.set( views );
-       },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.content.set( view );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        hijackThickbox: function() {
-               var frame = this;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // after bringing in the frame, load the actual editor via an ajax call
+               view.loadEditor();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                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 );
-               };
</del><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        restoreThickbox: function() {
-               if ( ! this._tb_remove ) {
-                       return;
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ renderImageDetailsToolbar: function() {
+               this.toolbar.set( new wp.media.view.Toolbar({
+                       controller: this,
+                       items: {
+                               select: {
+                                       style:    'primary',
+                                       text:     l10n.update,
+                                       priority: 80,
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                window.tb_remove = this._tb_remove;
-               delete this._tb_remove;
-       }
-});
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 click: function() {
+                                               var controller = this.controller,
+                                                       state = controller.state();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// 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;
-       };
-});
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         controller.close();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-module.exports = MediaFrame;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // 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() );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-/***/ }),
-/* 48 */
-/***/ (function(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();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Restore and reset the default state.
+                                               controller.setState( controller.options.state );
+                                               controller.reset();
+                                       }
+                               }
+                       }
+               }) );
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * 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;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ renderReplaceImageToolbar: function() {
+               var frame = this,
+                       lastState = frame.lastState(),
+                       previous = lastState && lastState.id;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( ! (selection instanceof wp.media.model.Selection) ) {
-                       this.options.selection = new wp.media.model.Selection( selection, {
-                               multiple: this.options.multiple
-                       });
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         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();
+                                               }
+                                       }
+                               },
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this._selection = {
-                       attachments: new wp.media.model.Attachments(),
-                       difference: []
-               };
-       },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         replace: {
+                                       style:    'primary',
+                                       text:     l10n.replace,
+                                       priority: 80,
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * Create the default states on the frame.
-        */
-       createStates: function() {
-               var options = this.options;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 click: function() {
+                                               var controller = this.controller,
+                                                       state = controller.state(),
+                                                       selection = state.get( 'selection' ),
+                                                       attachment = selection.single();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( this.options.states ) {
-                       return;
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         controller.close();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // 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
-                       })
-               ]);
-       },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         controller.image.changeAttachment( attachment, state.display( attachment ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * 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 );
-       },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // 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() );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * 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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // Restore and reset the default state.
+                                               controller.setState( controller.options.state );
+                                               controller.reset();
+                                       }
+                               }
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                });
-       },
-
-       /**
-        * 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
</del><span class="cx" style="display: block; padding: 0 10px">                 }) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        /**
-        * 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 );
-       }
</del><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-module.exports = Select;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = ImageDetails;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-/***/ }),
-/* 49 */
-/***/ (function(module, exports) {
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],45:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * wp.media.view.MediaFrame.Post
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3825,19 +5810,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Post;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-/***/ }),
-/* 50 */
-/***/ (function(module, exports) {
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],46:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * wp.media.view.MediaFrame.ImageDetails
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * wp.media.view.MediaFrame.Select
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * A media frame for manipulating an image that's already been inserted
- * into a post.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * A frame for selecting an item or items from the media library.
</ins><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @class
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @augments wp.media.view.MediaFrame.Select
</del><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.media.view.MediaFrame
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.media.view.Frame
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.media.View
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3845,391 +5824,166 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @mixes wp.media.controller.StateMachine
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Select = wp.media.view.MediaFrame.Select,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+var MediaFrame = wp.media.view.MediaFrame,
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        ImageDetails;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ Select;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-ImageDetails = Select.extend({
-       defaults: {
-               id:      'image',
-               url:     '',
-               menu:    'image-details',
-               content: 'image-details',
-               toolbar: 'image-details',
-               type:    'link',
-               title:    l10n.imageDetailsTitle,
-               priority: 120
-       },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Select = MediaFrame.extend({
+       initialize: function() {
+               // Call 'initialize' directly on the parent class.
+               MediaFrame.prototype.initialize.apply( this, arguments );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        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 );
-       },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         _.defaults( this.options, {
+                       selection: [],
+                       library:   {},
+                       multiple:  false,
+                       state:    'library'
+               });
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        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 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.createSelection();
+               this.createStates();
+               this.bindHandlers();
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        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
-                       } )
-               ]);
-       },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+        * 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;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        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;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( ! (selection instanceof wp.media.model.Selection) ) {
+                       this.options.selection = new wp.media.model.Selection( selection, {
+                               multiple: this.options.multiple
+                       });
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                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
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this._selection = {
+                       attachments: new wp.media.model.Attachments(),
+                       difference: []
</ins><span class="cx" style="display: block; padding: 0 10px">                 };
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @returns {wp.media.view.Modal} Returns itself to allow chaining
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Create the default states on the frame.
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        attach: function() {
-               if ( this.views.attached ) {
-                       return this;
-               }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ createStates: function() {
+               var options = this.options;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( ! this.views.rendered ) {
-                       this.render();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( this.options.states ) {
+                       return;
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                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');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // 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
+                       })
+               ]);
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @returns {wp.media.view.Modal} Returns itself to allow chaining
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Bind region mode event callbacks.
+        *
+        * @see media.controller.Region.render
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        detach: function() {
-               if ( this.$el.is(':visible') ) {
-                       this.close();
-               }
-
-               this.$el.detach();
-               this.views.attached = false;
-               return this.propagate('detach');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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 );
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @returns {wp.media.view.Modal} Returns itself to allow chaining
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Render callback for the router region in the `browse` mode.
+        *
+        * @param {wp.media.view.Router} routerView
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        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 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ browseRouter: function( routerView ) {
+               routerView.set({
+                       upload: {
+                               text:     l10n.uploadFilesTitle,
+                               priority: 20
+                       },
+                       browse: {
+                               text:     l10n.mediaLibraryTitle,
+                               priority: 40
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                }
-
-               this.$el.focus();
-
-               return this.propagate('open');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         });
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param {Object} options
-        * @returns {wp.media.view.Modal} Returns itself to allow chaining
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Render callback for the content region in the `browse` mode.
+        *
+        * @param {wp.media.controller.Region} contentRegion
</ins><span class="cx" style="display: block; padding: 0 10px">         &nb