Build/Test Tools: Correct JavaScript files in the 4.4 branch.

In [46498], some JavaScript files were unintentionally changed. This restores those files to their correct state.

Partially reverts [46498].
See #52367.

git-svn-id: https://develop.svn.wordpress.org/branches/4.4@50018 602fd350-edb4-49c9-b593-d223f7449a82

3 files changed, 5875 insertions, 6463 deletions

diff --git a/src/wp-includes/js/media-audiovideo.js b/src/wp-includes/js/media-audiovideo.js
index c94e96dede..5c64097c9d 100644
--- a/src/wp-includes/js/media-audiovideo.js
+++ b/src/wp-includes/js/media-audiovideo.js
@@ -1,72 +1,4 @@
-/******/ (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 = 0);
-/******/ })
-/************************************************************************/
-/******/ ([
-/* 0 */
-/***/ (function(module, exports, __webpack_require__) {
-
+(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){
 var media = wp.media,
 	baseSettings = window._wpmejsSettings || {},
 	l10n = window._wpMediaViewsL10n || {};
@@ -273,21 +205,83 @@ wp.media.video = {
 	}
 };
 
-media.model.PostMedia = __webpack_require__( 1 );
-media.controller.AudioDetails = __webpack_require__( 2 );
-media.controller.VideoDetails = __webpack_require__( 3 );
-media.view.MediaFrame.MediaDetails = __webpack_require__( 4 );
-media.view.MediaFrame.AudioDetails = __webpack_require__( 5 );
-media.view.MediaFrame.VideoDetails = __webpack_require__( 6 );
-media.view.MediaDetails = __webpack_require__( 7 );
-media.view.AudioDetails = __webpack_require__( 8 );
-media.view.VideoDetails = __webpack_require__( 9 );
+media.model.PostMedia = require( './models/post-media.js' );
+media.controller.AudioDetails = require( './controllers/audio-details.js' );
+media.controller.VideoDetails = require( './controllers/video-details.js' );
+media.view.MediaFrame.MediaDetails = require( './views/frame/media-details.js' );
+media.view.MediaFrame.AudioDetails = require( './views/frame/audio-details.js' );
+media.view.MediaFrame.VideoDetails = require( './views/frame/video-details.js' );
+media.view.MediaDetails = require( './views/media-details.js' );
+media.view.AudioDetails = require( './views/audio-details.js' );
+media.view.VideoDetails = require( './views/video-details.js' );
+
+},{"./controllers/audio-details.js":2,"./controllers/video-details.js":3,"./models/post-media.js":4,"./views/audio-details.js":5,"./views/frame/audio-details.js":6,"./views/frame/media-details.js":7,"./views/frame/video-details.js":8,"./views/media-details.js":9,"./views/video-details.js":10}],2:[function(require,module,exports){
+/**
+ * wp.media.controller.AudioDetails
+ *
+ * The controller for the Audio Details state
+ *
+ * @class
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ */
+var State = wp.media.controller.State,
+	l10n = wp.media.view.l10n,
+	AudioDetails;
+
+AudioDetails = State.extend({
+	defaults: {
+		id: 'audio-details',
+		toolbar: 'audio-details',
+		title: l10n.audioDetailsTitle,
+		content: 'audio-details',
+		menu: 'audio-details',
+		router: false,
+		priority: 60
+	},
 
+	initialize: function( options ) {
+		this.media = options.media;
+		State.prototype.initialize.apply( this, arguments );
+	}
+});
 
-/***/ }),
-/* 1 */
-/***/ (function(module, exports) {
+module.exports = AudioDetails;
 
+},{}],3:[function(require,module,exports){
+/**
+ * wp.media.controller.VideoDetails
+ *
+ * The controller for the Video Details state
+ *
+ * @class
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ */
+var State = wp.media.controller.State,
+	l10n = wp.media.view.l10n,
+	VideoDetails;
+
+VideoDetails = State.extend({
+	defaults: {
+		id: 'video-details',
+		toolbar: 'video-details',
+		title: l10n.videoDetailsTitle,
+		content: 'video-details',
+		menu: 'video-details',
+		router: false,
+		priority: 60
+	},
+
+	initialize: function( options ) {
+		this.media = options.media;
+		State.prototype.initialize.apply( this, arguments );
+	}
+});
+
+module.exports = VideoDetails;
+
+},{}],4:[function(require,module,exports){
 /**
  * wp.media.model.PostMedia
  *
@@ -329,85 +323,121 @@ var PostMedia = Backbone.Model.extend({
 
 module.exports = PostMedia;
 
-
-/***/ }),
-/* 2 */
-/***/ (function(module, exports) {
-
+},{}],5:[function(require,module,exports){
 /**
- * wp.media.controller.AudioDetails
- *
- * The controller for the Audio Details state
+ * wp.media.view.AudioDetails
  *
  * @class
- * @augments wp.media.controller.State
- * @augments Backbone.Model
+ * @augments wp.media.view.MediaDetails
+ * @augments wp.media.view.Settings.AttachmentDisplay
+ * @augments wp.media.view.Settings
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
  */
-var State = wp.media.controller.State,
-	l10n = wp.media.view.l10n,
+var MediaDetails = wp.media.view.MediaDetails,
 	AudioDetails;
 
-AudioDetails = State.extend({
-	defaults: {
-		id: 'audio-details',
-		toolbar: 'audio-details',
-		title: l10n.audioDetailsTitle,
-		content: 'audio-details',
-		menu: 'audio-details',
-		router: false,
-		priority: 60
-	},
+AudioDetails = MediaDetails.extend({
+	className: 'audio-details',
+	template:  wp.template('audio-details'),
 
-	initialize: function( options ) {
-		this.media = options.media;
-		State.prototype.initialize.apply( this, arguments );
+	setMedia: function() {
+		var audio = this.$('.wp-audio-shortcode');
+
+		if ( audio.find( 'source' ).length ) {
+			if ( audio.is(':hidden') ) {
+				audio.show();
+			}
+			this.media = MediaDetails.prepareSrc( audio.get(0) );
+		} else {
+			audio.hide();
+			this.media = false;
+		}
+
+		return this;
 	}
 });
 
 module.exports = AudioDetails;
 
-
-/***/ }),
-/* 3 */
-/***/ (function(module, exports) {
-
+},{}],6:[function(require,module,exports){
 /**
- * wp.media.controller.VideoDetails
- *
- * The controller for the Video Details state
+ * wp.media.view.MediaFrame.AudioDetails
  *
  * @class
- * @augments wp.media.controller.State
- * @augments Backbone.Model
+ * @augments wp.media.view.MediaFrame.MediaDetails
+ * @augments wp.media.view.MediaFrame.Select
+ * @augments wp.media.view.MediaFrame
+ * @augments wp.media.view.Frame
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ * @mixes wp.media.controller.StateMachine
  */
-var State = wp.media.controller.State,
+var MediaDetails = wp.media.view.MediaFrame.MediaDetails,
+	MediaLibrary = wp.media.controller.MediaLibrary,
+
 	l10n = wp.media.view.l10n,
-	VideoDetails;
+	AudioDetails;
 
-VideoDetails = State.extend({
+AudioDetails = MediaDetails.extend({
 	defaults: {
-		id: 'video-details',
-		toolbar: 'video-details',
-		title: l10n.videoDetailsTitle,
-		content: 'video-details',
-		menu: 'video-details',
-		router: false,
-		priority: 60
+		id:      'audio',
+		url:     '',
+		menu:    'audio-details',
+		content: 'audio-details',
+		toolbar: 'audio-details',
+		type:    'link',
+		title:    l10n.audioDetailsTitle,
+		priority: 120
 	},
 
 	initialize: function( options ) {
-		this.media = options.media;
-		State.prototype.initialize.apply( this, arguments );
-	}
-});
+		options.DetailsView = wp.media.view.AudioDetails;
+		options.cancelText = l10n.audioDetailsCancel;
+		options.addText = l10n.audioAddSourceTitle;
 
-module.exports = VideoDetails;
+		MediaDetails.prototype.initialize.call( this, options );
+	},
 
+	bindHandlers: function() {
+		MediaDetails.prototype.bindHandlers.apply( this, arguments );
+
+		this.on( 'toolbar:render:replace-audio', this.renderReplaceToolbar, this );
+		this.on( 'toolbar:render:add-audio-source', this.renderAddSourceToolbar, this );
+	},
+
+	createStates: function() {
+		this.states.add([
+			new wp.media.controller.AudioDetails( {
+				media: this.media
+			} ),
+
+			new MediaLibrary( {
+				type: 'audio',
+				id: 'replace-audio',
+				title: l10n.audioReplaceTitle,
+				toolbar: 'replace-audio',
+				media: this.media,
+				menu: 'audio-details'
+			} ),
+
+			new MediaLibrary( {
+				type: 'audio',
+				id: 'add-audio-source',
+				title: l10n.audioAddSourceTitle,
+				toolbar: 'add-audio-source',
+				media: this.media,
+				menu: false
+			} )
+		]);
+	}
+});
 
-/***/ }),
-/* 4 */
-/***/ (function(module, exports) {
+module.exports = AudioDetails;
 
+},{}],7:[function(require,module,exports){
 /**
  * wp.media.view.MediaFrame.MediaDetails
  *
@@ -537,91 +567,7 @@ MediaDetails = Select.extend({
 
 module.exports = MediaDetails;
 
-
-/***/ }),
-/* 5 */
-/***/ (function(module, exports) {
-
-/**
- * wp.media.view.MediaFrame.AudioDetails
- *
- * @class
- * @augments wp.media.view.MediaFrame.MediaDetails
- * @augments wp.media.view.MediaFrame.Select
- * @augments wp.media.view.MediaFrame
- * @augments wp.media.view.Frame
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- * @mixes wp.media.controller.StateMachine
- */
-var MediaDetails = wp.media.view.MediaFrame.MediaDetails,
-	MediaLibrary = wp.media.controller.MediaLibrary,
-
-	l10n = wp.media.view.l10n,
-	AudioDetails;
-
-AudioDetails = MediaDetails.extend({
-	defaults: {
-		id:      'audio',
-		url:     '',
-		menu:    'audio-details',
-		content: 'audio-details',
-		toolbar: 'audio-details',
-		type:    'link',
-		title:    l10n.audioDetailsTitle,
-		priority: 120
-	},
-
-	initialize: function( options ) {
-		options.DetailsView = wp.media.view.AudioDetails;
-		options.cancelText = l10n.audioDetailsCancel;
-		options.addText = l10n.audioAddSourceTitle;
-
-		MediaDetails.prototype.initialize.call( this, options );
-	},
-
-	bindHandlers: function() {
-		MediaDetails.prototype.bindHandlers.apply( this, arguments );
-
-		this.on( 'toolbar:render:replace-audio', this.renderReplaceToolbar, this );
-		this.on( 'toolbar:render:add-audio-source', this.renderAddSourceToolbar, this );
-	},
-
-	createStates: function() {
-		this.states.add([
-			new wp.media.controller.AudioDetails( {
-				media: this.media
-			} ),
-
-			new MediaLibrary( {
-				type: 'audio',
-				id: 'replace-audio',
-				title: l10n.audioReplaceTitle,
-				toolbar: 'replace-audio',
-				media: this.media,
-				menu: 'audio-details'
-			} ),
-
-			new MediaLibrary( {
-				type: 'audio',
-				id: 'add-audio-source',
-				title: l10n.audioAddSourceTitle,
-				toolbar: 'add-audio-source',
-				media: this.media,
-				menu: false
-			} )
-		]);
-	}
-});
-
-module.exports = AudioDetails;
-
-
-/***/ }),
-/* 6 */
-/***/ (function(module, exports) {
-
+},{}],8:[function(require,module,exports){
 /**
  * wp.media.view.MediaFrame.VideoDetails
  *
@@ -756,11 +702,7 @@ VideoDetails = MediaDetails.extend({
 
 module.exports = VideoDetails;
 
-
-/***/ }),
-/* 7 */
-/***/ (function(module, exports) {
-
+},{}],9:[function(require,module,exports){
 /* global MediaElementPlayer */
 
 /**
@@ -928,53 +870,7 @@ MediaDetails = AttachmentDisplay.extend({
 
 module.exports = MediaDetails;
 
-
-/***/ }),
-/* 8 */
-/***/ (function(module, exports) {
-
-/**
- * wp.media.view.AudioDetails
- *
- * @class
- * @augments wp.media.view.MediaDetails
- * @augments wp.media.view.Settings.AttachmentDisplay
- * @augments wp.media.view.Settings
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var MediaDetails = wp.media.view.MediaDetails,
-	AudioDetails;
-
-AudioDetails = MediaDetails.extend({
-	className: 'audio-details',
-	template:  wp.template('audio-details'),
-
-	setMedia: function() {
-		var audio = this.$('.wp-audio-shortcode');
-
-		if ( audio.find( 'source' ).length ) {
-			if ( audio.is(':hidden') ) {
-				audio.show();
-			}
-			this.media = MediaDetails.prepareSrc( audio.get(0) );
-		} else {
-			audio.hide();
-			this.media = false;
-		}
-
-		return this;
-	}
-});
-
-module.exports = AudioDetails;
-
-
-/***/ }),
-/* 9 */
-/***/ (function(module, exports) {
-
+},{}],10:[function(require,module,exports){
 /**
  * wp.media.view.VideoDetails
  *
@@ -1017,6 +913,4 @@ VideoDetails = MediaDetails.extend({
 
 module.exports = VideoDetails;
 
-
-/***/ })
-/******/ ]);
\ No newline at end of file
+},{}]},{},[1]);
diff --git a/src/wp-includes/js/media-grid.js b/src/wp-includes/js/media-grid.js
index c22ea14142..01db38bad5 100644
--- a/src/wp-includes/js/media-grid.js
+++ b/src/wp-includes/js/media-grid.js
@@ -1,99 +1,4 @@
-/******/ (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 = 10);
-/******/ })
-/************************************************************************/
-/******/ ([
-/* 0 */,
-/* 1 */,
-/* 2 */,
-/* 3 */,
-/* 4 */,
-/* 5 */,
-/* 6 */,
-/* 7 */,
-/* 8 */,
-/* 9 */,
-/* 10 */
-/***/ (function(module, exports, __webpack_require__) {
-
-var media = wp.media;
-
-media.controller.EditAttachmentMetadata = __webpack_require__( 11 );
-media.view.MediaFrame.Manage = __webpack_require__( 12 );
-media.view.Attachment.Details.TwoColumn = __webpack_require__( 13 );
-media.view.MediaFrame.Manage.Router = __webpack_require__( 14 );
-media.view.EditImage.Details = __webpack_require__( 15 );
-media.view.MediaFrame.EditAttachments = __webpack_require__( 16 );
-media.view.SelectModeToggleButton = __webpack_require__( 17 );
-media.view.DeleteSelectedButton = __webpack_require__( 18 );
-media.view.DeleteSelectedPermanentlyButton = __webpack_require__( 19 );
-
-
-/***/ }),
-/* 11 */
-/***/ (function(module, exports) {
-
+(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.EditAttachmentMetadata
  *
@@ -121,283 +26,68 @@ EditAttachmentMetadata = wp.media.controller.State.extend({
 
 module.exports = EditAttachmentMetadata;
 
+},{}],2:[function(require,module,exports){
+var media = wp.media;
 
-/***/ }),
-/* 12 */
-/***/ (function(module, exports) {
-
+media.controller.EditAttachmentMetadata = require( './controllers/edit-attachment-metadata.js' );
+media.view.MediaFrame.Manage = require( './views/frame/manage.js' );
+media.view.Attachment.Details.TwoColumn = require( './views/attachment/details-two-column.js' );
+media.view.MediaFrame.Manage.Router = require( './routers/manage.js' );
+media.view.EditImage.Details = require( './views/edit-image-details.js' );
+media.view.MediaFrame.EditAttachments = require( './views/frame/edit-attachments.js' );
+media.view.SelectModeToggleButton = require( './views/button/select-mode-toggle.js' );
+media.view.DeleteSelectedButton = require( './views/button/delete-selected.js' );
+media.view.DeleteSelectedPermanentlyButton = require( './views/button/delete-selected-permanently.js' );
+
+},{"./controllers/edit-attachment-metadata.js":1,"./routers/manage.js":3,"./views/attachment/details-two-column.js":4,"./views/button/delete-selected-permanently.js":5,"./views/button/delete-selected.js":6,"./views/button/select-mode-toggle.js":7,"./views/edit-image-details.js":8,"./views/frame/edit-attachments.js":9,"./views/frame/manage.js":10}],3:[function(require,module,exports){
 /**
- * wp.media.view.MediaFrame.Manage
- *
- * A generic management frame workflow.
+ * wp.media.view.MediaFrame.Manage.Router
  *
- * Used in the media grid view.
+ * A router for handling the browser history and application state.
  *
  * @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
+ * @augments Backbone.Router
  */
-var MediaFrame = wp.media.view.MediaFrame,
-	Library = wp.media.controller.Library,
-
-	$ = Backbone.$,
-	Manage;
-
-Manage = MediaFrame.extend({
-	/**
-	 * @global wp.Uploader
-	 */
-	initialize: function() {
-		_.defaults( this.options, {
-			title:     '',
-			modal:     false,
-			selection: [],
-			library:   {}, // Options hash for the query to the media library.
-			multiple:  'add',
-			state:     'library',
-			uploader:  true,
-			mode:      [ 'grid', 'edit' ]
-		});
-
-		this.$body = $( document.body );
-		this.$window = $( window );
-		this.$adminBar = $( '#wpadminbar' );
-		this.$window.on( 'scroll resize', _.debounce( _.bind( this.fixPosition, this ), 15 ) );
-		$( document ).on( 'click', '.page-title-action', _.bind( this.addNewClickHandler, this ) );
-
-		// Ensure core and media grid view UI is enabled.
-		this.$el.addClass('wp-core-ui');
-
-		// 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 a window-wide uploader.
-		if ( this.options.uploader ) {
-			this.uploader = new wp.media.view.UploaderWindow({
-				controller: this,
-				uploader: {
-					dropzone:  document.body,
-					container: document.body
-				}
-			}).render();
-			this.uploader.ready();
-			$('body').append( this.uploader.el );
-
-			this.options.uploader = false;
-		}
-
-		this.gridRouter = new wp.media.view.MediaFrame.Manage.Router();
-
-		// Call 'initialize' directly on the parent class.
-		MediaFrame.prototype.initialize.apply( this, arguments );
-
-		// Append the frame view directly the supplied container.
-		this.$el.appendTo( this.options.container );
-
-		this.createStates();
-		this.bindRegionModeHandlers();
-		this.render();
-		this.bindSearchHandler();
-	},
-
-	bindSearchHandler: function() {
-		var search = this.$( '#media-search-input' ),
-			currentSearch = this.options.container.data( 'search' ),
-			searchView = this.browserView.toolbar.get( 'search' ).$el,
-			listMode = this.$( '.view-list' ),
-
-			input  = _.debounce( function (e) {
-				var val = $( e.currentTarget ).val(),
-					url = '';
-
-				if ( val ) {
-					url += '?search=' + val;
-				}
-				this.gridRouter.navigate( this.gridRouter.baseUrl( url ) );
-			}, 1000 );
-
-		// Update the URL when entering search string (at most once per second)
-		search.on( 'input', _.bind( input, this ) );
-		searchView.val( currentSearch ).trigger( 'input' );
-
-		this.gridRouter.on( 'route:search', function () {
-			var href = window.location.href;
-			if ( href.indexOf( 'mode=' ) > -1 ) {
-				href = href.replace( /mode=[^&]+/g, 'mode=list' );
-			} else {
-				href += href.indexOf( '?' ) > -1 ? '&mode=list' : '?mode=list';
-			}
-			href = href.replace( 'search=', 's=' );
-			listMode.prop( 'href', href );
-		} );
-	},
-
-	/**
-	 * Create the default states for the frame.
-	 */
-	createStates: function() {
-		var options = this.options;
-
-		if ( this.options.states ) {
-			return;
-		}
-
-		// Add the default states.
-		this.states.add([
-			new Library({
-				library:            wp.media.query( options.library ),
-				multiple:           options.multiple,
-				title:              options.title,
-				content:            'browse',
-				toolbar:            'select',
-				contentUserSetting: false,
-				filterable:         'all',
-				autoSelect:         false
-			})
-		]);
-	},
-
-	/**
-	 * Bind region mode activation events to proper handlers.
-	 */
-	bindRegionModeHandlers: function() {
-		this.on( 'content:create:browse', this.browseContent, this );
-
-		// Handle a frame-level event for editing an attachment.
-		this.on( 'edit:attachment', this.openEditAttachmentModal, this );
-
-		this.on( 'select:activate', this.bindKeydown, this );
-		this.on( 'select:deactivate', this.unbindKeydown, this );
-	},
-
-	handleKeydown: function( e ) {
-		if ( 27 === e.which ) {
-			e.preventDefault();
-			this.deactivateMode( 'select' ).activateMode( 'edit' );
-		}
+var Router = Backbone.Router.extend({
+	routes: {
+		'upload.php?item=:slug':    'showItem',
+		'upload.php?search=:query': 'search'
 	},
 
-	bindKeydown: function() {
-		this.$body.on( 'keydown.select', _.bind( this.handleKeydown, this ) );
+	// Map routes against the page URL
+	baseUrl: function( url ) {
+		return 'upload.php' + url;
 	},
 
-	unbindKeydown: function() {
-		this.$body.off( 'keydown.select' );
+	// Respond to the search route by filling the search field and trigggering the input event
+	search: function( query ) {
+		jQuery( '#media-search-input' ).val( query ).trigger( 'input' );
 	},
 
-	fixPosition: function() {
-		var $browser, $toolbar;
-		if ( ! this.isModeActive( 'select' ) ) {
-			return;
-		}
-
-		$browser = this.$('.attachments-browser');
-		$toolbar = $browser.find('.media-toolbar');
+	// Show the modal with a specific item
+	showItem: function( query ) {
+		var media = wp.media,
+			library = media.frame.state().get('library'),
+			item;
 
-		// Offset doesn't appear to take top margin into account, hence +16
-		if ( ( $browser.offset().top + 16 ) < this.$window.scrollTop() + this.$adminBar.height() ) {
-			$browser.addClass( 'fixed' );
-			$toolbar.css('width', $browser.width() + 'px');
+		// Trigger the media frame to open the correct item
+		item = library.findWhere( { id: parseInt( query, 10 ) } );
+		if ( item ) {
+			media.frame.trigger( 'edit:attachment', item );
 		} else {
-			$browser.removeClass( 'fixed' );
-			$toolbar.css('width', '');
-		}
-	},
-
-	/**
-	 * Click handler for the `Add New` button.
-	 */
-	addNewClickHandler: function( event ) {
-		event.preventDefault();
-		this.trigger( 'toggle:upload:attachment' );
-	},
-
-	/**
-	 * Open the Edit Attachment modal.
-	 */
-	openEditAttachmentModal: function( model ) {
-		// Create a new EditAttachment frame, passing along the library and the attachment model.
-		wp.media( {
-			frame:       'edit-attachments',
-			controller:  this,
-			library:     this.state().get('library'),
-			model:       model
-		} );
-	},
-
-	/**
-	 * Create an attachments browser view within the content region.
-	 *
-	 * @param {Object} contentRegion Basic object with a `view` property, which
-	 *                               should be set with the proper region view.
-	 * @this wp.media.controller.Region
-	 */
-	browseContent: function( contentRegion ) {
-		var state = this.state();
-
-		// Browse our library of attachments.
-		this.browserView = 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.get('displaySettings'),
-			dragInfo:   state.get('dragInfo'),
-			sidebar:    'errors',
-
-			suggestedWidth:  state.get('suggestedWidth'),
-			suggestedHeight: state.get('suggestedHeight'),
-
-			AttachmentView: state.get('AttachmentView'),
-
-			scrollElement: document
-		});
-		this.browserView.on( 'ready', _.bind( this.bindDeferred, this ) );
-
-		this.errors = wp.Uploader.errors;
-		this.errors.on( 'add remove reset', this.sidebarVisibility, this );
-	},
-
-	sidebarVisibility: function() {
-		this.browserView.$( '.media-sidebar' ).toggle( !! this.errors.length );
-	},
-
-	bindDeferred: function() {
-		if ( ! this.browserView.dfd ) {
-			return;
-		}
-		this.browserView.dfd.done( _.bind( this.startHistory, this ) );
-	},
-
-	startHistory: function() {
-		// Verify pushState support and activate
-		if ( window.history && window.history.pushState ) {
-			Backbone.history.start( {
-				root: window._wpMediaGridSettings.adminUrl,
-				pushState: true
+			item = media.attachment( query );
+			media.frame.listenTo( item, 'change', function( model ) {
+				media.frame.stopListening( item );
+				media.frame.trigger( 'edit:attachment', model );
 			} );
+			item.fetch();
 		}
 	}
 });
 
-module.exports = Manage;
-
-
-/***/ }),
-/* 13 */
-/***/ (function(module, exports) {
+module.exports = Router;
 
+},{}],4:[function(require,module,exports){
 /**
  * wp.media.view.Attachment.Details.TwoColumn
  *
@@ -440,63 +130,181 @@ TwoColumn = Details.extend({
 
 module.exports = TwoColumn;
 
+},{}],5:[function(require,module,exports){
+/**
+ * wp.media.view.DeleteSelectedPermanentlyButton
+ *
+ * When MEDIA_TRASH is true, a button that handles bulk Delete Permanently logic
+ *
+ * @class
+ * @augments wp.media.view.DeleteSelectedButton
+ * @augments wp.media.view.Button
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Button = wp.media.view.Button,
+	DeleteSelected = wp.media.view.DeleteSelectedButton,
+	DeleteSelectedPermanently;
 
-/***/ }),
-/* 14 */
-/***/ (function(module, exports) {
+DeleteSelectedPermanently = DeleteSelected.extend({
+	initialize: function() {
+		DeleteSelected.prototype.initialize.apply( this, arguments );
+		this.listenTo( this.controller, 'select:activate', this.selectActivate );
+		this.listenTo( this.controller, 'select:deactivate', this.selectDeactivate );
+	},
+
+	filterChange: function( model ) {
+		this.canShow = ( 'trash' === model.get( 'status' ) );
+	},
+
+	selectActivate: function() {
+		this.toggleDisabled();
+		this.$el.toggleClass( 'hidden', ! this.canShow );
+	},
+
+	selectDeactivate: function() {
+		this.toggleDisabled();
+		this.$el.addClass( 'hidden' );
+	},
 
+	render: function() {
+		Button.prototype.render.apply( this, arguments );
+		this.selectActivate();
+		return this;
+	}
+});
+
+module.exports = DeleteSelectedPermanently;
+
+},{}],6:[function(require,module,exports){
 /**
- * wp.media.view.MediaFrame.Manage.Router
+ * wp.media.view.DeleteSelectedButton
  *
- * A router for handling the browser history and application state.
+ * A button that handles bulk Delete/Trash logic
  *
  * @class
- * @augments Backbone.Router
+ * @augments wp.media.view.Button
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
  */
-var Router = Backbone.Router.extend({
-	routes: {
-		'upload.php?item=:slug':    'showItem',
-		'upload.php?search=:query': 'search'
-	},
+var Button = wp.media.view.Button,
+	l10n = wp.media.view.l10n,
+	DeleteSelected;
 
-	// Map routes against the page URL
-	baseUrl: function( url ) {
-		return 'upload.php' + url;
+DeleteSelected = Button.extend({
+	initialize: function() {
+		Button.prototype.initialize.apply( this, arguments );
+		if ( this.options.filters ) {
+			this.listenTo( this.options.filters.model, 'change', this.filterChange );
+		}
+		this.listenTo( this.controller, 'selection:toggle', this.toggleDisabled );
 	},
 
-	// Respond to the search route by filling the search field and trigggering the input event
-	search: function( query ) {
-		jQuery( '#media-search-input' ).val( query ).trigger( 'input' );
+	filterChange: function( model ) {
+		if ( 'trash' === model.get( 'status' ) ) {
+			this.model.set( 'text', l10n.untrashSelected );
+		} else if ( wp.media.view.settings.mediaTrash ) {
+			this.model.set( 'text', l10n.trashSelected );
+		} else {
+			this.model.set( 'text', l10n.deleteSelected );
+		}
 	},
 
-	// Show the modal with a specific item
-	showItem: function( query ) {
-		var media = wp.media,
-			library = media.frame.state().get('library'),
-			item;
+	toggleDisabled: function() {
+		this.model.set( 'disabled', ! this.controller.state().get( 'selection' ).length );
+	},
 
-		// Trigger the media frame to open the correct item
-		item = library.findWhere( { id: parseInt( query, 10 ) } );
-		if ( item ) {
-			media.frame.trigger( 'edit:attachment', item );
+	render: function() {
+		Button.prototype.render.apply( this, arguments );
+		if ( this.controller.isModeActive( 'select' ) ) {
+			this.$el.addClass( 'delete-selected-button' );
 		} else {
-			item = media.attachment( query );
-			media.frame.listenTo( item, 'change', function( model ) {
-				media.frame.stopListening( item );
-				media.frame.trigger( 'edit:attachment', model );
-			} );
-			item.fetch();
+			this.$el.addClass( 'delete-selected-button hidden' );
 		}
+		this.toggleDisabled();
+		return this;
 	}
 });
 
-module.exports = Router;
+module.exports = DeleteSelected;
 
+},{}],7:[function(require,module,exports){
+/**
+ * wp.media.view.SelectModeToggleButton
+ *
+ * @class
+ * @augments wp.media.view.Button
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Button = wp.media.view.Button,
+	l10n = wp.media.view.l10n,
+	SelectModeToggle;
 
-/***/ }),
-/* 15 */
-/***/ (function(module, exports) {
+SelectModeToggle = Button.extend({
+	initialize: function() {
+		_.defaults( this.options, {
+			size : ''
+		} );
+
+		Button.prototype.initialize.apply( this, arguments );
+		this.listenTo( this.controller, 'select:activate select:deactivate', this.toggleBulkEditHandler );
+		this.listenTo( this.controller, 'selection:action:done', this.back );
+	},
+
+	back: function () {
+		this.controller.deactivateMode( 'select' ).activateMode( 'edit' );
+	},
+
+	click: function() {
+		Button.prototype.click.apply( this, arguments );
+		if ( this.controller.isModeActive( 'select' ) ) {
+			this.back();
+		} else {
+			this.controller.deactivateMode( 'edit' ).activateMode( 'select' );
+		}
+	},
+
+	render: function() {
+		Button.prototype.render.apply( this, arguments );
+		this.$el.addClass( 'select-mode-toggle-button' );
+		return this;
+	},
+
+	toggleBulkEditHandler: function() {
+		var toolbar = this.controller.content.get().toolbar, children;
+
+		children = toolbar.$( '.media-toolbar-secondary > *, .media-toolbar-primary > *' );
+
+		// TODO: the Frame should be doing all of this.
+		if ( this.controller.isModeActive( 'select' ) ) {
+			this.model.set( {
+				size: 'large',
+				text: l10n.cancelSelection
+			} );
+			children.not( '.spinner, .media-button' ).hide();
+			this.$el.show();
+			toolbar.$( '.delete-selected-button' ).removeClass( 'hidden' );
+		} else {
+			this.model.set( {
+				size: '',
+				text: l10n.bulkSelect
+			} );
+			this.controller.content.get().$el.removeClass( 'fixed' );
+			toolbar.$el.css( 'width', '' );
+			toolbar.$( '.delete-selected-button' ).addClass( 'hidden' );
+			children.not( '.media-button' ).show();
+			this.controller.state().get( 'selection' ).reset();
+		}
+	}
+});
 
+module.exports = SelectModeToggle;
+
+},{}],8:[function(require,module,exports){
 /**
  * wp.media.view.EditImage.Details
  *
@@ -531,11 +339,7 @@ Details = EditImage.extend({
 
 module.exports = Details;
 
-
-/***/ }),
-/* 16 */
-/***/ (function(module, exports) {
-
+},{}],9:[function(require,module,exports){
 /**
  * wp.media.view.MediaFrame.EditAttachments
  *
@@ -778,192 +582,272 @@ EditAttachments = MediaFrame.extend({
 
 module.exports = EditAttachments;
 
-
-/***/ }),
-/* 17 */
-/***/ (function(module, exports) {
-
+},{}],10:[function(require,module,exports){
 /**
- * wp.media.view.SelectModeToggleButton
+ * wp.media.view.MediaFrame.Manage
+ *
+ * A generic management frame workflow.
+ *
+ * Used in the media grid view.
  *
  * @class
- * @augments wp.media.view.Button
+ * @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 Button = wp.media.view.Button,
-	l10n = wp.media.view.l10n,
-	SelectModeToggle;
+var MediaFrame = wp.media.view.MediaFrame,
+	Library = wp.media.controller.Library,
 
-SelectModeToggle = Button.extend({
+	$ = Backbone.$,
+	Manage;
+
+Manage = MediaFrame.extend({
+	/**
+	 * @global wp.Uploader
+	 */
 	initialize: function() {
 		_.defaults( this.options, {
-			size : ''
-		} );
+			title:     '',
+			modal:     false,
+			selection: [],
+			library:   {}, // Options hash for the query to the media library.
+			multiple:  'add',
+			state:     'library',
+			uploader:  true,
+			mode:      [ 'grid', 'edit' ]
+		});
 
-		Button.prototype.initialize.apply( this, arguments );
-		this.listenTo( this.controller, 'select:activate select:deactivate', this.toggleBulkEditHandler );
-		this.listenTo( this.controller, 'selection:action:done', this.back );
-	},
+		this.$body = $( document.body );
+		this.$window = $( window );
+		this.$adminBar = $( '#wpadminbar' );
+		this.$window.on( 'scroll resize', _.debounce( _.bind( this.fixPosition, this ), 15 ) );
+		$( document ).on( 'click', '.page-title-action', _.bind( this.addNewClickHandler, this ) );
 
-	back: function () {
-		this.controller.deactivateMode( 'select' ).activateMode( 'edit' );
-	},
+		// Ensure core and media grid view UI is enabled.
+		this.$el.addClass('wp-core-ui');
 
-	click: function() {
-		Button.prototype.click.apply( this, arguments );
-		if ( this.controller.isModeActive( 'select' ) ) {
-			this.back();
-		} else {
-			this.controller.deactivateMode( 'edit' ).activateMode( 'select' );
+		// 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;
 		}
-	},
 
-	render: function() {
-		Button.prototype.render.apply( this, arguments );
-		this.$el.addClass( 'select-mode-toggle-button' );
-		return this;
+		// Initialize a window-wide uploader.
+		if ( this.options.uploader ) {
+			this.uploader = new wp.media.view.UploaderWindow({
+				controller: this,
+				uploader: {
+					dropzone:  document.body,
+					container: document.body
+				}
+			}).render();
+			this.uploader.ready();
+			$('body').append( this.uploader.el );
+
+			this.options.uploader = false;
+		}
+
+		this.gridRouter = new wp.media.view.MediaFrame.Manage.Router();
+
+		// Call 'initialize' directly on the parent class.
+		MediaFrame.prototype.initialize.apply( this, arguments );
+
+		// Append the frame view directly the supplied container.
+		this.$el.appendTo( this.options.container );
+
+		this.createStates();
+		this.bindRegionModeHandlers();
+		this.render();
+		this.bindSearchHandler();
 	},
 
-	toggleBulkEditHandler: function() {
-		var toolbar = this.controller.content.get().toolbar, children;
+	bindSearchHandler: function() {
+		var search = this.$( '#media-search-input' ),
+			currentSearch = this.options.container.data( 'search' ),
+			searchView = this.browserView.toolbar.get( 'search' ).$el,
+			listMode = this.$( '.view-list' ),
 
-		children = toolbar.$( '.media-toolbar-secondary > *, .media-toolbar-primary > *' );
+			input  = _.debounce( function (e) {
+				var val = $( e.currentTarget ).val(),
+					url = '';
 
-		// TODO: the Frame should be doing all of this.
-		if ( this.controller.isModeActive( 'select' ) ) {
-			this.model.set( {
-				size: 'large',
-				text: l10n.cancelSelection
-			} );
-			children.not( '.spinner, .media-button' ).hide();
-			this.$el.show();
-			toolbar.$( '.delete-selected-button' ).removeClass( 'hidden' );
-		} else {
-			this.model.set( {
-				size: '',
-				text: l10n.bulkSelect
-			} );
-			this.controller.content.get().$el.removeClass( 'fixed' );
-			toolbar.$el.css( 'width', '' );
-			toolbar.$( '.delete-selected-button' ).addClass( 'hidden' );
-			children.not( '.media-button' ).show();
-			this.controller.state().get( 'selection' ).reset();
+				if ( val ) {
+					url += '?search=' + val;
+				}
+				this.gridRouter.navigate( this.gridRouter.baseUrl( url ) );
+			}, 1000 );
+
+		// Update the URL when entering search string (at most once per second)
+		search.on( 'input', _.bind( input, this ) );
+		searchView.val( currentSearch ).trigger( 'input' );
+
+		this.gridRouter.on( 'route:search', function () {
+			var href = window.location.href;
+			if ( href.indexOf( 'mode=' ) > -1 ) {
+				href = href.replace( /mode=[^&]+/g, 'mode=list' );
+			} else {
+				href += href.indexOf( '?' ) > -1 ? '&mode=list' : '?mode=list';
+			}
+			href = href.replace( 'search=', 's=' );
+			listMode.prop( 'href', href );
+		} );
+	},
+
+	/**
+	 * Create the default states for the frame.
+	 */
+	createStates: function() {
+		var options = this.options;
+
+		if ( this.options.states ) {
+			return;
 		}
-	}
-});
 
-module.exports = SelectModeToggle;
+		// Add the default states.
+		this.states.add([
+			new Library({
+				library:            wp.media.query( options.library ),
+				multiple:           options.multiple,
+				title:              options.title,
+				content:            'browse',
+				toolbar:            'select',
+				contentUserSetting: false,
+				filterable:         'all',
+				autoSelect:         false
+			})
+		]);
+	},
 
+	/**
+	 * Bind region mode activation events to proper handlers.
+	 */
+	bindRegionModeHandlers: function() {
+		this.on( 'content:create:browse', this.browseContent, this );
 
-/***/ }),
-/* 18 */
-/***/ (function(module, exports) {
+		// Handle a frame-level event for editing an attachment.
+		this.on( 'edit:attachment', this.openEditAttachmentModal, this );
 
-/**
- * wp.media.view.DeleteSelectedButton
- *
- * A button that handles bulk Delete/Trash logic
- *
- * @class
- * @augments wp.media.view.Button
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var Button = wp.media.view.Button,
-	l10n = wp.media.view.l10n,
-	DeleteSelected;
+		this.on( 'select:activate', this.bindKeydown, this );
+		this.on( 'select:deactivate', this.unbindKeydown, this );
+	},
 
-DeleteSelected = Button.extend({
-	initialize: function() {
-		Button.prototype.initialize.apply( this, arguments );
-		if ( this.options.filters ) {
-			this.listenTo( this.options.filters.model, 'change', this.filterChange );
+	handleKeydown: function( e ) {
+		if ( 27 === e.which ) {
+			e.preventDefault();
+			this.deactivateMode( 'select' ).activateMode( 'edit' );
 		}
-		this.listenTo( this.controller, 'selection:toggle', this.toggleDisabled );
 	},
 
-	filterChange: function( model ) {
-		if ( 'trash' === model.get( 'status' ) ) {
-			this.model.set( 'text', l10n.untrashSelected );
-		} else if ( wp.media.view.settings.mediaTrash ) {
-			this.model.set( 'text', l10n.trashSelected );
-		} else {
-			this.model.set( 'text', l10n.deleteSelected );
-		}
+	bindKeydown: function() {
+		this.$body.on( 'keydown.select', _.bind( this.handleKeydown, this ) );
 	},
 
-	toggleDisabled: function() {
-		this.model.set( 'disabled', ! this.controller.state().get( 'selection' ).length );
+	unbindKeydown: function() {
+		this.$body.off( 'keydown.select' );
 	},
 
-	render: function() {
-		Button.prototype.render.apply( this, arguments );
-		if ( this.controller.isModeActive( 'select' ) ) {
-			this.$el.addClass( 'delete-selected-button' );
+	fixPosition: function() {
+		var $browser, $toolbar;
+		if ( ! this.isModeActive( 'select' ) ) {
+			return;
+		}
+
+		$browser = this.$('.attachments-browser');
+		$toolbar = $browser.find('.media-toolbar');
+
+		// Offset doesn't appear to take top margin into account, hence +16
+		if ( ( $browser.offset().top + 16 ) < this.$window.scrollTop() + this.$adminBar.height() ) {
+			$browser.addClass( 'fixed' );
+			$toolbar.css('width', $browser.width() + 'px');
 		} else {
-			this.$el.addClass( 'delete-selected-button hidden' );
+			$browser.removeClass( 'fixed' );
+			$toolbar.css('width', '');
 		}
-		this.toggleDisabled();
-		return this;
-	}
-});
+	},
 
-module.exports = DeleteSelected;
+	/**
+	 * Click handler for the `Add New` button.
+	 */
+	addNewClickHandler: function( event ) {
+		event.preventDefault();
+		this.trigger( 'toggle:upload:attachment' );
+	},
 
+	/**
+	 * Open the Edit Attachment modal.
+	 */
+	openEditAttachmentModal: function( model ) {
+		// Create a new EditAttachment frame, passing along the library and the attachment model.
+		wp.media( {
+			frame:       'edit-attachments',
+			controller:  this,
+			library:     this.state().get('library'),
+			model:       model
+		} );
+	},
 
-/***/ }),
-/* 19 */
-/***/ (function(module, exports) {
+	/**
+	 * Create an attachments browser view within the content region.
+	 *
+	 * @param {Object} contentRegion Basic object with a `view` property, which
+	 *                               should be set with the proper region view.
+	 * @this wp.media.controller.Region
+	 */
+	browseContent: function( contentRegion ) {
+		var state = this.state();
 
-/**
- * wp.media.view.DeleteSelectedPermanentlyButton
- *
- * When MEDIA_TRASH is true, a button that handles bulk Delete Permanently logic
- *
- * @class
- * @augments wp.media.view.DeleteSelectedButton
- * @augments wp.media.view.Button
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var Button = wp.media.view.Button,
-	DeleteSelected = wp.media.view.DeleteSelectedButton,
-	DeleteSelectedPermanently;
+		// Browse our library of attachments.
+		this.browserView = 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.get('displaySettings'),
+			dragInfo:   state.get('dragInfo'),
+			sidebar:    'errors',
 
-DeleteSelectedPermanently = DeleteSelected.extend({
-	initialize: function() {
-		DeleteSelected.prototype.initialize.apply( this, arguments );
-		this.listenTo( this.controller, 'select:activate', this.selectActivate );
-		this.listenTo( this.controller, 'select:deactivate', this.selectDeactivate );
-	},
+			suggestedWidth:  state.get('suggestedWidth'),
+			suggestedHeight: state.get('suggestedHeight'),
 
-	filterChange: function( model ) {
-		this.canShow = ( 'trash' === model.get( 'status' ) );
+			AttachmentView: state.get('AttachmentView'),
+
+			scrollElement: document
+		});
+		this.browserView.on( 'ready', _.bind( this.bindDeferred, this ) );
+
+		this.errors = wp.Uploader.errors;
+		this.errors.on( 'add remove reset', this.sidebarVisibility, this );
 	},
 
-	selectActivate: function() {
-		this.toggleDisabled();
-		this.$el.toggleClass( 'hidden', ! this.canShow );
+	sidebarVisibility: function() {
+		this.browserView.$( '.media-sidebar' ).toggle( !! this.errors.length );
 	},
 
-	selectDeactivate: function() {
-		this.toggleDisabled();
-		this.$el.addClass( 'hidden' );
+	bindDeferred: function() {
+		if ( ! this.browserView.dfd ) {
+			return;
+		}
+		this.browserView.dfd.done( _.bind( this.startHistory, this ) );
 	},
 
-	render: function() {
-		Button.prototype.render.apply( this, arguments );
-		this.selectActivate();
-		return this;
+	startHistory: function() {
+		// Verify pushState support and activate
+		if ( window.history && window.history.pushState ) {
+			Backbone.history.start( {
+				root: window._wpMediaGridSettings.adminUrl,
+				pushState: true
+			} );
+		}
 	}
 });
 
-module.exports = DeleteSelectedPermanently;
-
+module.exports = Manage;
 
-/***/ })
-/******/ ]);
\ No newline at end of file
+},{}]},{},[2]);
diff --git a/src/wp-includes/js/media-views.js b/src/wp-includes/js/media-views.js
index 0b96f7ec5d..9e08201541 100644
--- a/src/wp-includes/js/media-views.js
+++ b/src/wp-includes/js/media-views.js
@@ -1,227 +1,1389 @@
-/******/ (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__) {
+(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;
 
-var media = wp.media,
+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,
 	$ = jQuery,
-	l10n;
+	CollectionEdit;
 
-media.isTouchDevice = ( 'ontouchend' in document );
+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
+	},
 
-// Link any localized strings.
-l10n = media.view.l10n = window._wpMediaViewsL10n || {};
+	/**
+	 * @since 3.9.0
+	 */
+	initialize: function() {
+		var collectionType = this.get('collectionType');
 
-// Link any settings.
-media.view.settings = l10n.settings || {};
-delete l10n.settings;
+		if ( 'video' === this.get( 'type' ) ) {
+			collectionType = 'video-' + collectionType;
+		}
 
-// Copy the `post` setting over to the model settings.
-media.model.settings.post = media.view.settings.post;
+		this.set( 'id', collectionType + '-edit' );
+		this.set( 'toolbar', collectionType + '-edit' );
 
-// 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;
+		// 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 );
+	},
 
-	transition = _.find( _.keys( transitions ), function( transition ) {
-		return ! _.isUndefined( style[ transition ] );
-	});
+	/**
+	 * @since 3.9.0
+	 */
+	activate: function() {
+		var library = this.get('library');
 
-	return transition && {
-		end: transitions[ transition ]
-	};
-}());
+		// Limit the library to images only.
+		library.props.set( 'type', this.get( 'type' ) );
+
+		// 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){
 /**
- * A shared event bus used to provide events into
- * the media workflows that 3rd-party devs can use to hook
- * in.
+ * wp.media.controller.Cropper
+ *
+ * A state for cropping an image.
+ *
+ * @class
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
  */
-media.events = _.extend( {}, Backbone.Events );
+var l10n = wp.media.view.l10n,
+	Cropper;
+
+Cropper = wp.media.controller.State.extend({
+	defaults: {
+		id:          'cropper',
+		title:       l10n.cropImage,
+		// Region mode defaults.
+		toolbar:     'crop',
+		content:     'crop',
+		router:      false,
+
+		canSkipCrop: false
+	},
+
+	activate: function() {
+		this.frame.on( 'content:create:crop', this.createCropContent, this );
+		this.frame.on( 'close', this.removeCropper, this );
+		this.set('selection', new Backbone.Collection(this.frame._selection.single));
+	},
+
+	deactivate: function() {
+		this.frame.toolbar.mode('browse');
+	},
+
+	createCropContent: function() {
+		this.cropperView = new wp.media.view.Cropper({
+			controller: this,
+			attachment: this.get('selection').first()
+		});
+		this.cropperView.on('image-loaded', this.createCropToolbar, this);
+		this.frame.content.set(this.cropperView);
+
+	},
+	removeCropper: function() {
+		this.imgSelect.cancelSelection();
+		this.imgSelect.setOptions({remove: true});
+		this.imgSelect.update();
+		this.cropperView.remove();
+	},
+	createCropToolbar: function() {
+		var canSkipCrop, toolbarOptions;
+
+		canSkipCrop = this.get('canSkipCrop') || false;
+
+		toolbarOptions = {
+			controller: this.frame,
+			items: {
+				insert: {
+					style:    'primary',
+					text:     l10n.cropImage,
+					priority: 80,
+					requires: { library: false, selection: false },
+
+					click: function() {
+						var controller = this.controller,
+							selection;
+
+						selection = controller.state().get('selection').first();
+						selection.set({cropDetails: controller.state().imgSelect.getSelection()});
+
+						this.$el.text(l10n.cropping);
+						this.$el.attr('disabled', true);
+
+						controller.state().doCrop( selection ).done( function( croppedImage ) {
+							controller.trigger('cropped', croppedImage );
+							controller.close();
+						}).fail( function() {
+							controller.trigger('content:error:crop');
+						});
+					}
+				}
+			}
+		};
+
+		if ( canSkipCrop ) {
+			_.extend( toolbarOptions.items, {
+				skip: {
+					style:      'secondary',
+					text:       l10n.skipCropping,
+					priority:   70,
+					requires:   { library: false, selection: false },
+					click:      function() {
+						var selection = this.controller.state().get('selection').first();
+						this.controller.state().cropperView.remove();
+						this.controller.trigger('skippedcrop', selection);
+						this.controller.close();
+					}
+				}
+			});
+		}
 
+		this.frame.toolbar.set( new wp.media.view.Toolbar(toolbarOptions) );
+	},
+
+	doCrop: function( attachment ) {
+		return wp.ajax.post( 'custom-header-crop', {
+			nonce: attachment.get('nonces').edit,
+			id: attachment.get('id'),
+			cropDetails: attachment.get('cropDetails')
+		} );
+	}
+});
+
+module.exports = Cropper;
+
+},{}],4:[function(require,module,exports){
 /**
- * Makes it easier to bind events using transitions.
+ * wp.media.controller.CustomizeImageCropper
  *
- * @param {string} selector
- * @param {Number} sensitivity
- * @returns {Promise}
+ * A state for cropping an image.
+ *
+ * @class
+ * @augments wp.media.controller.Cropper
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
  */
-media.transition = function( selector, sensitivity ) {
-	var deferred = $.Deferred();
+var Controller = wp.media.controller,
+	CustomizeImageCropper;
 
-	sensitivity = sensitivity || 2000;
+CustomizeImageCropper = Controller.Cropper.extend({
+	doCrop: function( attachment ) {
+		var cropDetails = attachment.get( 'cropDetails' ),
+			control = this.get( 'control' );
 
-	if ( $.support.transition ) {
-		if ( ! (selector instanceof $) ) {
-			selector = $( selector );
+		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 );
 		}
 
-		// Resolve the deferred when the first element finishes animating.
-		selector.first().one( $.support.transition.end, deferred.resolve );
+		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;
+		}
 
-		// Just in case the event doesn't trigger, fire a callback.
-		_.delay( deferred.resolve, sensitivity );
+		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();
 
-	// Otherwise, execute on the spot.
-	} else {
-		deferred.resolve();
+		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();
+		}
 	}
+});
 
-	return deferred.promise();
-};
+module.exports = Embed;
+
+},{}],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;
+
+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 ),
+
+	/**
+	 * @since 3.5.0
+	 */
+	initialize: function() {
+		var library, comparator;
+
+		// 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.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){
+/**
+ * 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: getUserSetting( 'align', defaultProps.align ) || 'none',
+			size:  getUserSetting( 'imgsize', defaultProps.size ) || 'medium',
+			link:  getUserSetting( 'urlbutton', defaultProps.link ) || 'none'
+		};
+	},
+
+	/**
+	 * 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 = _.clone( this._defaultDisplaySettings );
+
+		if ( settings.canEmbed = this.canEmbed( attachment ) ) {
+			settings.link = 'embed';
+		} else if ( ! this.isImageAttachment( attachment ) && settings.link === 'none' ) {
+			settings.link = 'file';
+		}
+
+		return settings;
+	},
+
+	/**
+	 * Whether an attachment is image.
+	 *
+	 * @since 4.4.1
+	 *
+	 * @param {wp.media.model.Attachment} attachment
+	 * @returns {Boolean}
+	 */
+	isImageAttachment: function( attachment ) {
+		// If uploading, we know the filename but not the mime type.
+		if ( attachment.get('uploading') ) {
+			return /\.(jpe?g|png|gif)$/i.test( attachment.get('filename') );
+		}
+
+		return attachment.get('type') === 'image';
+	},
+
+	/**
+	 * 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 );
 
-media.controller.Region = __webpack_require__( 27 );
-media.controller.StateMachine = __webpack_require__( 28 );
-media.controller.State = __webpack_require__( 29 );
-
-media.selectionSync = __webpack_require__( 30 );
-media.controller.Library = __webpack_require__( 31 );
-media.controller.ImageDetails = __webpack_require__( 32 );
-media.controller.GalleryEdit = __webpack_require__( 33 );
-media.controller.GalleryAdd = __webpack_require__( 34 );
-media.controller.CollectionEdit = __webpack_require__( 35 );
-media.controller.CollectionAdd = __webpack_require__( 36 );
-media.controller.FeaturedImage = __webpack_require__( 37 );
-media.controller.ReplaceImage = __webpack_require__( 38 );
-media.controller.EditImage = __webpack_require__( 39 );
-media.controller.MediaLibrary = __webpack_require__( 40 );
-media.controller.Embed = __webpack_require__( 41 );
-media.controller.Cropper = __webpack_require__( 42 );
-media.controller.CustomizeImageCropper = __webpack_require__( 43 );
-media.controller.SiteIconCropper = __webpack_require__( 44 );
-
-media.View = __webpack_require__( 45 );
-media.view.Frame = __webpack_require__( 46 );
-media.view.MediaFrame = __webpack_require__( 47 );
-media.view.MediaFrame.Select = __webpack_require__( 48 );
-media.view.MediaFrame.Post = __webpack_require__( 49 );
-media.view.MediaFrame.ImageDetails = __webpack_require__( 50 );
-media.view.Modal = __webpack_require__( 51 );
-media.view.FocusManager = __webpack_require__( 52 );
-media.view.UploaderWindow = __webpack_require__( 53 );
-media.view.EditorUploader = __webpack_require__( 54 );
-media.view.UploaderInline = __webpack_require__( 55 );
-media.view.UploaderStatus = __webpack_require__( 56 );
-media.view.UploaderStatusError = __webpack_require__( 57 );
-media.view.Toolbar = __webpack_require__( 58 );
-media.view.Toolbar.Select = __webpack_require__( 59 );
-media.view.Toolbar.Embed = __webpack_require__( 60 );
-media.view.Button = __webpack_require__( 61 );
-media.view.ButtonGroup = __webpack_require__( 62 );
-media.view.PriorityList = __webpack_require__( 63 );
-media.view.MenuItem = __webpack_require__( 64 );
-media.view.Menu = __webpack_require__( 65 );
-media.view.RouterItem = __webpack_require__( 66 );
-media.view.Router = __webpack_require__( 67 );
-media.view.Sidebar = __webpack_require__( 68 );
-media.view.Attachment = __webpack_require__( 69 );
-media.view.Attachment.Library = __webpack_require__( 70 );
-media.view.Attachment.EditLibrary = __webpack_require__( 71 );
-media.view.Attachments = __webpack_require__( 72 );
-media.view.Search = __webpack_require__( 73 );
-media.view.AttachmentFilters = __webpack_require__( 74 );
-media.view.DateFilter = __webpack_require__( 75 );
-media.view.AttachmentFilters.Uploaded = __webpack_require__( 76 );
-media.view.AttachmentFilters.All = __webpack_require__( 77 );
-media.view.AttachmentsBrowser = __webpack_require__( 78 );
-media.view.Selection = __webpack_require__( 79 );
-media.view.Attachment.Selection = __webpack_require__( 80 );
-media.view.Attachments.Selection = __webpack_require__( 81 );
-media.view.Attachment.EditSelection = __webpack_require__( 82 );
-media.view.Settings = __webpack_require__( 83 );
-media.view.Settings.AttachmentDisplay = __webpack_require__( 84 );
-media.view.Settings.Gallery = __webpack_require__( 85 );
-media.view.Settings.Playlist = __webpack_require__( 86 );
-media.view.Attachment.Details = __webpack_require__( 87 );
-media.view.AttachmentCompat = __webpack_require__( 88 );
-media.view.Iframe = __webpack_require__( 89 );
-media.view.Embed = __webpack_require__( 90 );
-media.view.Label = __webpack_require__( 91 );
-media.view.EmbedUrl = __webpack_require__( 92 );
-media.view.EmbedLink = __webpack_require__( 93 );
-media.view.EmbedImage = __webpack_require__( 94 );
-media.view.ImageDetails = __webpack_require__( 95 );
-media.view.Cropper = __webpack_require__( 96 );
-media.view.SiteIconCropper = __webpack_require__( 97 );
-media.view.SiteIconPreview = __webpack_require__( 98 );
-media.view.EditImage = __webpack_require__( 99 );
-media.view.Spinner = __webpack_require__( 100 );
-
-
-/***/ }),
-/* 27 */
-/***/ (function(module, exports) {
+module.exports = Library;
 
+},{}],12:[function(require,module,exports){
+/**
+ * wp.media.controller.MediaLibrary
+ *
+ * @class
+ * @augments wp.media.controller.Library
+ * @augments wp.media.controller.State
+ * @augments Backbone.Model
+ */
+var Library = wp.media.controller.Library,
+	MediaLibrary;
+
+MediaLibrary = Library.extend({
+	defaults: _.defaults({
+		// Attachments browser defaults. @see media.view.AttachmentsBrowser
+		filterable:      'uploaded',
+
+		displaySettings: false,
+		priority:        80,
+		syncSelection:   false
+	}, Library.prototype.defaults ),
+
+	/**
+	 * @since 3.9.0
+	 *
+	 * @param options
+	 */
+	initialize: function( options ) {
+		this.media = options.media;
+		this.type = options.type;
+		this.set( 'library', wp.media.query({ type: this.type }) );
+
+		Library.prototype.initialize.apply( this, arguments );
+	},
+
+	/**
+	 * @since 3.9.0
+	 */
+	activate: function() {
+		// @todo this should use this.frame.
+		if ( wp.media.frame.lastMime ) {
+			this.set( 'library', wp.media.query({ type: wp.media.frame.lastMime }) );
+			delete wp.media.frame.lastMime;
+		}
+		Library.prototype.activate.apply( this, arguments );
+	}
+});
+
+module.exports = MediaLibrary;
+
+},{}],13:[function(require,module,exports){
 /**
  * wp.media.controller.Region
  *
@@ -400,11 +1562,164 @@ _.extend( Region.prototype, {
 
 module.exports = Region;
 
+},{}],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;
+
+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 ),
+
+	/**
+	 * @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 );
+			}
+		};
 
-/***/ }),
-/* 28 */
-/***/ (function(module, exports) {
+		// 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){
+/**
+ * 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){
 /**
  * wp.media.controller.StateMachine
  *
@@ -528,11 +1843,7 @@ _.each([ 'on', 'off', 'trigger' ], function( method ) {
 
 module.exports = StateMachine;
 
-
-/***/ }),
-/* 29 */
-/***/ (function(module, exports) {
-
+},{}],17:[function(require,module,exports){
 /**
  * wp.media.controller.State
  *
@@ -773,11 +2084,7 @@ _.each(['toolbar','content'], function( region ) {
 
 module.exports = State;
 
-
-/***/ }),
-/* 30 */
-/***/ (function(module, exports) {
-
+},{}],18:[function(require,module,exports){
 /**
  * wp.media.selectionSync
  *
@@ -843,1679 +2150,2610 @@ var selectionSync = {
 
 module.exports = selectionSync;
 
+},{}],19:[function(require,module,exports){
+var media = wp.media,
+	$ = jQuery,
+	l10n;
 
-/***/ }),
-/* 31 */
-/***/ (function(module, exports) {
+media.isTouchDevice = ( 'ontouchend' in document );
 
-/**
- * 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;
+// Link any localized strings.
+l10n = media.view.l10n = window._wpMediaViewsL10n || {};
 
-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
-	},
+// Link any settings.
+media.view.settings = l10n.settings || {};
+delete l10n.settings;
 
-	/**
-	 * 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;
+// Copy the `post` setting over to the model settings.
+media.model.settings.post = media.view.settings.post;
 
-		if ( ! this.get('library') ) {
-			this.set( 'library', wp.media.query() );
-		}
+// 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;
 
-		if ( ! ( selection instanceof wp.media.model.Selection ) ) {
-			props = selection;
+	transition = _.find( _.keys( transitions ), function( transition ) {
+		return ! _.isUndefined( style[ transition ] );
+	});
 
-			if ( ! props ) {
-				props = this.get('library').props.toJSON();
-				props = _.omit( props, 'orderby', 'query' );
-			}
+	return transition && {
+		end: transitions[ transition ]
+	};
+}());
 
-			this.set( 'selection', new wp.media.model.Selection( null, {
-				multiple: this.get('multiple'),
-				props: props
-			}) );
-		}
+/**
+ * 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 );
 
-		this.resetDisplays();
-	},
+/**
+ * Makes it easier to bind events using transitions.
+ *
+ * @param {string} selector
+ * @param {Number} sensitivity
+ * @returns {Promise}
+ */
+media.transition = function( selector, sensitivity ) {
+	var deferred = $.Deferred();
 
-	/**
-	 * @since 3.5.0
-	 */
-	activate: function() {
-		this.syncSelection();
+	sensitivity = sensitivity || 2000;
 
-		wp.Uploader.queue.on( 'add', this.uploading, this );
+	if ( $.support.transition ) {
+		if ( ! (selector instanceof $) ) {
+			selector = $( selector );
+		}
 
-		this.get('selection').on( 'add remove reset', this.refreshContent, this );
+		// Resolve the deferred when the first element finishes animating.
+		selector.first().one( $.support.transition.end, deferred.resolve );
 
-		if ( this.get( 'router' ) && this.get('contentUserSetting') ) {
-			this.frame.on( 'content:activate', this.saveContentMode, this );
-			this.set( 'content', getUserSetting( 'libraryContent', this.get('content') ) );
-		}
-	},
+		// Just in case the event doesn't trigger, fire a callback.
+		_.delay( deferred.resolve, sensitivity );
 
-	/**
-	 * @since 3.5.0
-	 */
-	deactivate: function() {
-		this.recordSelection();
+	// Otherwise, execute on the spot.
+	} else {
+		deferred.resolve();
+	}
 
-		this.frame.off( 'content:activate', this.saveContentMode, this );
+	return deferred.promise();
+};
 
-		// Unbind all event handlers that use this state as the context
-		// from the selection.
-		this.get('selection').off( null, null, this );
+media.controller.Region = require( './controllers/region.js' );
+media.controller.StateMachine = require( './controllers/state-machine.js' );
+media.controller.State = require( './controllers/state.js' );
+
+media.selectionSync = require( './utils/selection-sync.js' );
+media.controller.Library = require( './controllers/library.js' );
+media.controller.ImageDetails = require( './controllers/image-details.js' );
+media.controller.GalleryEdit = require( './controllers/gallery-edit.js' );
+media.controller.GalleryAdd = require( './controllers/gallery-add.js' );
+media.controller.CollectionEdit = require( './controllers/collection-edit.js' );
+media.controller.CollectionAdd = require( './controllers/collection-add.js' );
+media.controller.FeaturedImage = require( './controllers/featured-image.js' );
+media.controller.ReplaceImage = require( './controllers/replace-image.js' );
+media.controller.EditImage = require( './controllers/edit-image.js' );
+media.controller.MediaLibrary = require( './controllers/media-library.js' );
+media.controller.Embed = require( './controllers/embed.js' );
+media.controller.Cropper = require( './controllers/cropper.js' );
+media.controller.CustomizeImageCropper = require( './controllers/customize-image-cropper.js' );
+media.controller.SiteIconCropper = require( './controllers/site-icon-cropper.js' );
+
+media.View = require( './views/view.js' );
+media.view.Frame = require( './views/frame.js' );
+media.view.MediaFrame = require( './views/media-frame.js' );
+media.view.MediaFrame.Select = require( './views/frame/select.js' );
+media.view.MediaFrame.Post = require( './views/frame/post.js' );
+media.view.MediaFrame.ImageDetails = require( './views/frame/image-details.js' );
+media.view.Modal = require( './views/modal.js' );
+media.view.FocusManager = require( './views/focus-manager.js' );
+media.view.UploaderWindow = require( './views/uploader/window.js' );
+media.view.EditorUploader = require( './views/uploader/editor.js' );
+media.view.UploaderInline = require( './views/uploader/inline.js' );
+media.view.UploaderStatus = require( './views/uploader/status.js' );
+media.view.UploaderStatusError = require( './views/uploader/status-error.js' );
+media.view.Toolbar = require( './views/toolbar.js' );
+media.view.Toolbar.Select = require( './views/toolbar/select.js' );
+media.view.Toolbar.Embed = require( './views/toolbar/embed.js' );
+media.view.Button = require( './views/button.js' );
+media.view.ButtonGroup = require( './views/button-group.js' );
+media.view.PriorityList = require( './views/priority-list.js' );
+media.view.MenuItem = require( './views/menu-item.js' );
+media.view.Menu = require( './views/menu.js' );
+media.view.RouterItem = require( './views/router-item.js' );
+media.view.Router = require( './views/router.js' );
+media.view.Sidebar = require( './views/sidebar.js' );
+media.view.Attachment = require( './views/attachment.js' );
+media.view.Attachment.Library = require( './views/attachment/library.js' );
+media.view.Attachment.EditLibrary = require( './views/attachment/edit-library.js' );
+media.view.Attachments = require( './views/attachments.js' );
+media.view.Search = require( './views/search.js' );
+media.view.AttachmentFilters = require( './views/attachment-filters.js' );
+media.view.DateFilter = require( './views/attachment-filters/date.js' );
+media.view.AttachmentFilters.Uploaded = require( './views/attachment-filters/uploaded.js' );
+media.view.AttachmentFilters.All = require( './views/attachment-filters/all.js' );
+media.view.AttachmentsBrowser = require( './views/attachments/browser.js' );
+media.view.Selection = require( './views/selection.js' );
+media.view.Attachment.Selection = require( './views/attachment/selection.js' );
+media.view.Attachments.Selection = require( './views/attachments/selection.js' );
+media.view.Attachment.EditSelection = require( './views/attachment/edit-selection.js' );
+media.view.Settings = require( './views/settings.js' );
+media.view.Settings.AttachmentDisplay = require( './views/settings/attachment-display.js' );
+media.view.Settings.Gallery = require( './views/settings/gallery.js' );
+media.view.Settings.Playlist = require( './views/settings/playlist.js' );
+media.view.Attachment.Details = require( './views/attachment/details.js' );
+media.view.AttachmentCompat = require( './views/attachment-compat.js' );
+media.view.Iframe = require( './views/iframe.js' );
+media.view.Embed = require( './views/embed.js' );
+media.view.Label = require( './views/label.js' );
+media.view.EmbedUrl = require( './views/embed/url.js' );
+media.view.EmbedLink = require( './views/embed/link.js' );
+media.view.EmbedImage = require( './views/embed/image.js' );
+media.view.ImageDetails = require( './views/image-details.js' );
+media.view.Cropper = require( './views/cropper.js' );
+media.view.SiteIconCropper = require( './views/site-icon-cropper.js' );
+media.view.SiteIconPreview = require( './views/site-icon-preview.js' );
+media.view.EditImage = require( './views/edit-image.js' );
+media.view.Spinner = require( './views/spinner.js' );
+
+},{"./controllers/collection-add.js":1,"./controllers/collection-edit.js":2,"./controllers/cropper.js":3,"./controllers/customize-image-cropper.js":4,"./controllers/edit-image.js":5,"./controllers/embed.js":6,"./controllers/featured-image.js":7,"./controllers/gallery-add.js":8,"./controllers/gallery-edit.js":9,"./controllers/image-details.js":10,"./controllers/library.js":11,"./controllers/media-library.js":12,"./controllers/region.js":13,"./controllers/replace-image.js":14,"./controllers/site-icon-cropper.js":15,"./controllers/state-machine.js":16,"./controllers/state.js":17,"./utils/selection-sync.js":18,"./views/attachment-compat.js":20,"./views/attachment-filters.js":21,"./views/attachment-filters/all.js":22,"./views/attachment-filters/date.js":23,"./views/attachment-filters/uploaded.js":24,"./views/attachment.js":25,"./views/attachment/details.js":26,"./views/attachment/edit-library.js":27,"./views/attachment/edit-selection.js":28,"./views/attachment/library.js":29,"./views/attachment/selection.js":30,"./views/attachments.js":31,"./views/attachments/browser.js":32,"./views/attachments/selection.js":33,"./views/button-group.js":34,"./views/button.js":35,"./views/cropper.js":36,"./views/edit-image.js":37,"./views/embed.js":38,"./views/embed/image.js":39,"./views/embed/link.js":40,"./views/embed/url.js":41,"./views/focus-manager.js":42,"./views/frame.js":43,"./views/frame/image-details.js":44,"./views/frame/post.js":45,"./views/frame/select.js":46,"./views/iframe.js":47,"./views/image-details.js":48,"./views/label.js":49,"./views/media-frame.js":50,"./views/menu-item.js":51,"./views/menu.js":52,"./views/modal.js":53,"./views/priority-list.js":54,"./views/router-item.js":55,"./views/router.js":56,"./views/search.js":57,"./views/selection.js":58,"./views/settings.js":59,"./views/settings/attachment-display.js":60,"./views/settings/gallery.js":61,"./views/settings/playlist.js":62,"./views/sidebar.js":63,"./views/site-icon-cropper.js":64,"./views/site-icon-preview.js":65,"./views/spinner.js":66,"./views/toolbar.js":67,"./views/toolbar/embed.js":68,"./views/toolbar/select.js":69,"./views/uploader/editor.js":70,"./views/uploader/inline.js":71,"./views/uploader/status-error.js":72,"./views/uploader/status.js":73,"./views/uploader/window.js":74,"./views/view.js":75}],20:[function(require,module,exports){
+/**
+ * wp.media.view.AttachmentCompat
+ *
+ * A view to display fields added via the `attachment_fields_to_edit` filter.
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var View = wp.media.View,
+	AttachmentCompat;
 
-		wp.Uploader.queue.off( null, null, this );
+AttachmentCompat = View.extend({
+	tagName:   'form',
+	className: 'compat-item',
+
+	events: {
+		'submit':          'preventDefault',
+		'change input':    'save',
+		'change select':   'save',
+		'change textarea': 'save'
 	},
 
+	initialize: function() {
+		this.listenTo( this.model, 'change:compat', this.render );
+	},
 	/**
-	 * Reset the library to its initial state.
-	 *
-	 * @since 3.5.0
+	 * @returns {wp.media.view.AttachmentCompat} Returns itself to allow chaining
 	 */
-	reset: function() {
-		this.get('selection').reset();
-		this.resetDisplays();
-		this.refreshContent();
+	dispose: function() {
+		if ( this.$(':focus').length ) {
+			this.save();
+		}
+		/**
+		 * call 'dispose' directly on the parent class
+		 */
+		return View.prototype.dispose.apply( this, arguments );
 	},
+	/**
+	 * @returns {wp.media.view.AttachmentCompat} Returns itself to allow chaining
+	 */
+	render: function() {
+		var compat = this.model.get('compat');
+		if ( ! compat || ! compat.item ) {
+			return;
+		}
 
+		this.views.detach();
+		this.$el.html( compat.item );
+		this.views.render();
+		return this;
+	},
 	/**
-	 * 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
+	 * @param {Object} event
 	 */
-	resetDisplays: function() {
-		var defaultProps = wp.media.view.settings.defaultProps;
-		this._displays = [];
-		this._defaultDisplaySettings = {
-			align: getUserSetting( 'align', defaultProps.align ) || 'none',
-			size:  getUserSetting( 'imgsize', defaultProps.size ) || 'medium',
-			link:  getUserSetting( 'urlbutton', defaultProps.link ) || 'none'
-		};
+	preventDefault: function( event ) {
+		event.preventDefault();
 	},
-
 	/**
-	 * 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}
+	 * @param {Object} event
 	 */
-	display: function( attachment ) {
-		var displays = this._displays;
+	save: function( event ) {
+		var data = {};
 
-		if ( ! displays[ attachment.cid ] ) {
-			displays[ attachment.cid ] = new Backbone.Model( this.defaultDisplaySettings( attachment ) );
+		if ( event ) {
+			event.preventDefault();
 		}
-		return displays[ attachment.cid ];
+
+		_.each( this.$el.serializeArray(), function( pair ) {
+			data[ pair.name ] = pair.value;
+		});
+
+		this.controller.trigger( 'attachment:compat:waiting', ['waiting'] );
+		this.model.saveCompat( data ).always( _.bind( this.postSave, this ) );
 	},
 
-	/**
-	 * 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 = _.clone( this._defaultDisplaySettings );
+	postSave: function() {
+		this.controller.trigger( 'attachment:compat:ready', ['ready'] );
+	}
+});
 
-		if ( settings.canEmbed = this.canEmbed( attachment ) ) {
-			settings.link = 'embed';
-		} else if ( ! this.isImageAttachment( attachment ) && settings.link === 'none' ) {
-			settings.link = 'file';
-		}
+module.exports = AttachmentCompat;
 
-		return settings;
+},{}],21:[function(require,module,exports){
+/**
+ * wp.media.view.AttachmentFilters
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var $ = jQuery,
+	AttachmentFilters;
+
+AttachmentFilters = wp.media.View.extend({
+	tagName:   'select',
+	className: 'attachment-filters',
+	id:        'media-attachment-filters',
+
+	events: {
+		change: 'change'
 	},
 
-	/**
-	 * Whether an attachment is image.
-	 *
-	 * @since 4.4.1
-	 *
-	 * @param {wp.media.model.Attachment} attachment
-	 * @returns {Boolean}
-	 */
-	isImageAttachment: function( attachment ) {
-		// If uploading, we know the filename but not the mime type.
-		if ( attachment.get('uploading') ) {
-			return /\.(jpe?g|png|gif)$/i.test( attachment.get('filename') );
-		}
+	keys: [],
 
-		return attachment.get('type') === 'image';
+	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();
 	},
 
 	/**
-	 * Whether an attachment can be embedded (audio or video).
-	 *
-	 * @since 3.6.0
-	 *
-	 * @param {wp.media.model.Attachment} attachment
-	 * @returns {Boolean}
+	 * @abstract
 	 */
-	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() );
+	createFilters: function() {
+		this.filters = {};
 	},
 
-
 	/**
-	 * 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
+	 * When the selected filter changes, update the Attachment Query properties to match.
 	 */
-	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') );
+	change: function() {
+		var filter = this.filters[ this.el.value ];
+		if ( filter ) {
+			this.model.set( filter.props );
 		}
 	},
 
-	/**
-	 * 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;
+	select: function() {
+		var model = this.model,
+			value = 'all',
+			props = model.toJSON();
 
-		if ( 'upload' === content.mode() ) {
-			this.frame.content.mode('browse');
-		}
+		_.find( this.filters, function( filter, id ) {
+			var equal = _.all( filter.props, function( prop, key ) {
+				return prop === ( _.isUndefined( props[ key ] ) ? null : props[ key ] );
+			});
 
-		if ( this.get( 'autoSelect' ) ) {
-			this.get('selection').add( attachment );
-			this.frame.trigger( 'library:selection:add' );
-		}
-	},
+			if ( equal ) {
+				return value = id;
+			}
+		});
 
-	/**
-	 * Persist the mode of the content region as a user setting.
-	 *
-	 * @since 3.5.0
-	 */
-	saveContentMode: function() {
-		if ( 'browse' !== this.get('router') ) {
-			return;
+		this.$el.val( value );
+	}
+});
+
+module.exports = AttachmentFilters;
+
+},{}],22:[function(require,module,exports){
+/**
+ * wp.media.view.AttachmentFilters.All
+ *
+ * @class
+ * @augments wp.media.view.AttachmentFilters
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var l10n = wp.media.view.l10n,
+	All;
+
+All = wp.media.view.AttachmentFilters.extend({
+	createFilters: function() {
+		var filters = {};
+
+		_.each( wp.media.view.settings.mimeTypes || {}, function( text, key ) {
+			filters[ key ] = {
+				text: text,
+				props: {
+					status:  null,
+					type:    key,
+					uploadedTo: null,
+					orderby: 'date',
+					order:   'DESC'
+				}
+			};
+		});
+
+		filters.all = {
+			text:  l10n.allMediaItems,
+			props: {
+				status:  null,
+				type:    null,
+				uploadedTo: null,
+				orderby: 'date',
+				order:   'DESC'
+			},
+			priority: 10
+		};
+
+		if ( wp.media.view.settings.post.id ) {
+			filters.uploaded = {
+				text:  l10n.uploadedToThisPost,
+				props: {
+					status:  null,
+					type:    null,
+					uploadedTo: wp.media.view.settings.post.id,
+					orderby: 'menuOrder',
+					order:   'ASC'
+				},
+				priority: 20
+			};
 		}
 
-		var mode = this.frame.content.mode(),
-			view = this.frame.router.get();
+		filters.unattached = {
+			text:  l10n.unattached,
+			props: {
+				status:     null,
+				uploadedTo: 0,
+				type:       null,
+				orderby:    'menuOrder',
+				order:      'ASC'
+			},
+			priority: 50
+		};
 
-		if ( view && view.get( mode ) ) {
-			setUserSetting( 'libraryContent', mode );
+		if ( wp.media.view.settings.mediaTrash &&
+			this.controller.isModeActive( 'grid' ) ) {
+
+			filters.trash = {
+				text:  l10n.trash,
+				props: {
+					uploadedTo: null,
+					status:     'trash',
+					type:       null,
+					orderby:    'date',
+					order:      'DESC'
+				},
+				priority: 50
+			};
 		}
+
+		this.filters = filters;
 	}
 });
 
-// Make selectionSync available on any Media Library state.
-_.extend( Library.prototype, wp.media.selectionSync );
+module.exports = All;
 
-module.exports = Library;
+},{}],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;
 
+DateFilter = wp.media.view.AttachmentFilters.extend({
+	id: 'media-attachment-date-filters',
 
-/***/ }),
-/* 32 */
-/***/ (function(module, exports) {
+	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;
+	}
+});
 
+module.exports = DateFilter;
+
+},{}],24:[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.
+ * wp.media.view.AttachmentFilters.Uploaded
  *
  * @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.
+ * @augments wp.media.view.AttachmentFilters
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
  */
-var State = wp.media.controller.State,
-	Library = wp.media.controller.Library,
-	l10n = wp.media.view.l10n,
-	ImageDetails;
+var l10n = wp.media.view.l10n,
+	Uploaded;
 
-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 ),
+Uploaded = wp.media.view.AttachmentFilters.extend({
+	createFilters: function() {
+		var type = this.model.get('type'),
+			types = wp.media.view.settings.mimeTypes,
+			text;
 
-	/**
-	 * @since 3.9.0
-	 *
-	 * @param options Attributes
-	 */
-	initialize: function( options ) {
-		this.image = options.image;
-		State.prototype.initialize.apply( this, arguments );
-	},
+		if ( types && type ) {
+			text = types[ type ];
+		}
 
-	/**
-	 * @since 3.9.0
-	 */
-	activate: function() {
-		this.frame.modal.$el.addClass('image-details');
-	}
-});
+		this.filters = {
+			all: {
+				text:  text || l10n.allMediaItems,
+				props: {
+					uploadedTo: null,
+					orderby: 'date',
+					order:   'DESC'
+				},
+				priority: 10
+			},
 
-module.exports = ImageDetails;
+			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
+			}
+		};
+	}
+});
 
-/***/ }),
-/* 33 */
-/***/ (function(module, exports) {
+module.exports = Uploaded;
 
+},{}],25:[function(require,module,exports){
 /**
- * wp.media.controller.GalleryEdit
- *
- * A state for editing a gallery's images and settings.
+ * wp.media.view.Attachment
  *
  * @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.
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
  */
-var Library = wp.media.controller.Library,
-	l10n = wp.media.view.l10n,
-	GalleryEdit;
+var View = wp.media.View,
+	$ = jQuery,
+	Attachment;
 
-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
+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' )
+		};
 	},
 
-	/**
-	 * @since 3.5.0
-	 */
+	events: {
+		'click .js--select-attachment':   'toggleSelectionHandler',
+		'change [data-setting]':          'updateSetting',
+		'change [data-setting] input':    'updateSetting',
+		'change [data-setting] select':   'updateSetting',
+		'change [data-setting] textarea': 'updateSetting',
+		'click .attachment-close':        'removeFromLibrary',
+		'click .check':                   'checkClickHandler',
+		'keydown':                        'toggleSelectionHandler'
+	},
+
+	buttons: {},
+
 	initialize: function() {
-		// If we haven't been provided a `library`, create a `Selection`.
-		if ( ! this.get('library') ) {
-			this.set( 'library', new wp.media.model.Selection() );
+		var selection = this.options.selection,
+			options = _.defaults( this.options, {
+				rerenderOnModelChange: true
+			} );
+
+		if ( options.rerenderOnModelChange ) {
+			this.listenTo( this.model, 'change', this.render );
+		} else {
+			this.listenTo( this.model, 'change:percent', this.progress );
 		}
+		this.listenTo( this.model, 'change:title', this._syncTitle );
+		this.listenTo( this.model, 'change:caption', this._syncCaption );
+		this.listenTo( this.model, 'change:artist', this._syncArtist );
+		this.listenTo( this.model, 'change:album', this._syncAlbum );
 
-		// The single `Attachment` view to be used in the `Attachments` view.
-		if ( ! this.get('AttachmentView') ) {
-			this.set( 'AttachmentView', wp.media.view.Attachment.EditLibrary );
+		// 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') );
 		}
 
-		Library.prototype.initialize.apply( this, arguments );
+		this.listenTo( this.controller, 'attachment:compat:waiting attachment:compat:ready', this.updateSave );
 	},
+	/**
+	 * @returns {wp.media.view.Attachment} Returns itself to allow chaining
+	 */
+	dispose: function() {
+		var selection = this.options.selection;
+
+		// Make sure all settings are saved before removing the view.
+		this.updateAll();
 
+		if ( selection ) {
+			selection.off( null, null, this );
+		}
+		/**
+		 * call 'dispose' directly on the parent class
+		 */
+		View.prototype.dispose.apply( this, arguments );
+		return this;
+	},
 	/**
-	 * @since 3.5.0
+	 * @returns {wp.media.view.Attachment} Returns itself to allow chaining
 	 */
-	activate: function() {
-		var library = this.get('library');
+	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 );
 
-		// Limit the library to images only.
-		library.props.set( 'type', 'image' );
+		options.buttons  = this.buttons;
+		options.describe = this.controller.state().get('describe');
 
-		// Watch for uploaded attachments.
-		this.get('library').observe( wp.Uploader.queue );
+		if ( 'image' === options.type ) {
+			options.size = this.imageSize();
+		}
 
-		this.frame.on( 'content:render:browse', this.gallerySettings, this );
+		options.can = {};
+		if ( options.nonces ) {
+			options.can.remove = !! options.nonces['delete'];
+			options.can.save = !! options.nonces.update;
+		}
 
-		Library.prototype.activate.apply( this, arguments );
-	},
+		if ( this.controller.state().get('allowLocalEdits') ) {
+			options.allowLocalEdits = true;
+		}
 
-	/**
-	 * @since 3.5.0
-	 */
-	deactivate: function() {
-		// Stop watching for uploaded attachments.
-		this.get('library').unobserve( wp.Uploader.queue );
+		if ( options.uploading && ! options.percent ) {
+			options.percent = 0;
+		}
 
-		this.frame.off( 'content:render:browse', this.gallerySettings, this );
+		this.views.detach();
+		this.$el.html( this.template( options ) );
 
-		Library.prototype.deactivate.apply( this, arguments );
+		this.$el.toggleClass( 'uploading', options.uploading );
+
+		if ( options.uploading ) {
+			this.$bar = this.$('.media-progress-bar div');
+		} else {
+			delete this.$bar;
+		}
+
+		// Check if the model is selected.
+		this.updateSelect();
+
+		// Update the save status.
+		this.updateSave();
+
+		this.views.render();
+
+		return this;
+	},
+
+	progress: function() {
+		if ( this.$bar && this.$bar.length ) {
+			this.$bar.width( this.model.get('percent') + '%' );
+		}
 	},
 
 	/**
-	 * @since 3.5.0
-	 *
-	 * @param browser
+	 * @param {Object} event
 	 */
-	gallerySettings: function( browser ) {
-		if ( ! this.get('displaySettings') ) {
+	toggleSelectionHandler: function( event ) {
+		var method;
+
+		// Don't do anything inside inputs and on the attachment check and remove buttons.
+		if ( 'INPUT' === event.target.nodeName || 'BUTTON' === event.target.nodeName ) {
 			return;
 		}
 
-		var library = this.get('library');
+		// Catch arrow events
+		if ( 37 === event.keyCode || 38 === event.keyCode || 39 === event.keyCode || 40 === event.keyCode ) {
+			this.controller.trigger( 'attachment:keydown:arrow', event );
+			return;
+		}
 
-		if ( ! library || ! browser ) {
+		// Catch enter and space events
+		if ( 'keydown' === event.type && 13 !== event.keyCode && 32 !== event.keyCode ) {
 			return;
 		}
 
-		library.gallery = library.gallery || new Backbone.Model();
+		event.preventDefault();
 
-		browser.sidebar.set({
-			gallery: new wp.media.view.Settings.Gallery({
-				controller: this,
-				model:      library.gallery,
-				priority:   40
-			})
+		// 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
 		});
 
-		browser.toolbar.set( 'reverse', {
-			text:     l10n.reverseOrder,
-			priority: 80,
+		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;
 
-			click: function() {
-				library.reset( library.toArray().reverse() );
+		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;
 			}
-		});
-	}
-});
 
-module.exports = GalleryEdit;
+			singleIndex = collection.indexOf( single );
+			modelIndex  = collection.indexOf( this.model );
 
+			if ( singleIndex < modelIndex ) {
+				models = collection.models.slice( singleIndex, modelIndex + 1 );
+			} else {
+				models = collection.models.slice( modelIndex, singleIndex + 1 );
+			}
 
-/***/ }),
-/* 34 */
-/***/ (function(module, exports) {
+			selection.add( models );
+			selection.single( model );
+			return;
 
-/**
- * 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;
+		// 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;
+		}
 
-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 ),
+		// Fixes bug that loses focus when selecting a featured image
+		if ( ! method ) {
+			method = 'add';
+		}
 
-	/**
-	 * @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' }) );
+		if ( method !== 'add' ) {
+			method = 'reset';
 		}
 
-		Library.prototype.initialize.apply( this, arguments );
+		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' ]();
+	},
 	/**
-	 * @since 3.5.0
+	 * @returns {unresolved|Boolean}
 	 */
-	activate: function() {
-		var library = this.get('library'),
-			edit    = this.frame.state('gallery-edit').get('library');
+	selected: function() {
+		var selection = this.options.selection;
+		if ( selection ) {
+			return !! selection.get( this.model.cid );
+		}
+	},
+	/**
+	 * @param {Backbone.Model} model
+	 * @param {Backbone.Collection} collection
+	 */
+	select: function( model, collection ) {
+		var selection = this.options.selection,
+			controller = this.controller;
 
-		if ( this.editLibrary && this.editLibrary !== edit ) {
-			library.unobserve( this.editLibrary );
+		// 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;
 		}
 
-		// 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 );
-		};
+		// Bail if the model is already selected.
+		if ( this.$el.hasClass( 'selected' ) ) {
+			return;
+		}
 
-		// 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;
+		// Add 'selected' class to model, set aria-checked to true.
+		this.$el.addClass( 'selected' ).attr( 'aria-checked', true );
+		//  Make the checkbox tabable, except in media grid (bulk select mode).
+		if ( ! ( controller.isModeActive( 'grid' ) && controller.isModeActive( 'select' ) ) ) {
+			this.$( '.check' ).attr( 'tabindex', '0' );
+		}
+	},
+	/**
+	 * @param {Backbone.Model} model
+	 * @param {Backbone.Collection} collection
+	 */
+	deselect: function( model, collection ) {
+		var selection = this.options.selection;
 
-		Library.prototype.activate.apply( this, arguments );
-	}
-});
+		// Check if a selection exists and if it's the collection provided.
+		// If they're not the same collection, bail; we're in another
+		// selection's event loop.
+		if ( ! selection || ( collection && collection !== selection ) ) {
+			return;
+		}
+		this.$el.removeClass( 'selected' ).attr( 'aria-checked', false )
+			.find( '.check' ).attr( 'tabindex', '-1' );
+	},
+	/**
+	 * @param {Backbone.Model} model
+	 * @param {Backbone.Collection} collection
+	 */
+	details: function( model, collection ) {
+		var selection = this.options.selection,
+			details;
 
-module.exports = GalleryAdd;
+		if ( selection !== collection ) {
+			return;
+		}
 
+		details = selection.single();
+		this.$el.toggleClass( 'details', details === this.model );
+	},
+	/**
+	 * @param {string} size
+	 * @returns {Object}
+	 */
+	imageSize: function( size ) {
+		var sizes = this.model.get('sizes'), matched = false;
 
-/***/ }),
-/* 35 */
-/***/ (function(module, exports) {
+		size = size || 'medium';
 
-/**
- * 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;
+		// 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;
+			}
 
-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
-	},
+			if ( matched ) {
+				return _.clone( matched );
+			}
+		}
 
+		return {
+			url:         this.model.get('url'),
+			width:       this.model.get('width'),
+			height:      this.model.get('height'),
+			orientation: this.model.get('orientation')
+		};
+	},
 	/**
-	 * @since 3.9.0
+	 * @param {Object} event
 	 */
-	initialize: function() {
-		var collectionType = this.get('collectionType');
+	updateSetting: function( event ) {
+		var $setting = $( event.target ).closest('[data-setting]'),
+			setting, value;
 
-		if ( 'video' === this.get( 'type' ) ) {
-			collectionType = 'video-' + collectionType;
+		if ( ! $setting.length ) {
+			return;
 		}
 
-		this.set( 'id', collectionType + '-edit' );
-		this.set( 'toolbar', collectionType + '-edit' );
+		setting = $setting.data('setting');
+		value   = event.target.value;
 
-		// 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 );
+		if ( this.model.get( setting ) !== value ) {
+			this.save( setting, value );
 		}
-		Library.prototype.initialize.apply( this, arguments );
 	},
 
 	/**
-	 * @since 3.9.0
+	 * 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.
 	 */
-	activate: function() {
-		var library = this.get('library');
+	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;
 
-		// Limit the library to images only.
-		library.props.set( 'type', this.get( 'type' ) );
+		// If we're waiting to remove 'Saved.', stop.
+		if ( save.savedTimer ) {
+			clearTimeout( save.savedTimer );
+		}
 
-		// Watch for uploaded attachments.
-		this.get('library').observe( wp.Uploader.queue );
+		this.updateSave('waiting');
+		save.requests = requests;
+		requests.always( function() {
+			// If we've performed another request since this one, bail.
+			if ( save.requests !== requests ) {
+				return;
+			}
 
-		this.frame.on( 'content:render:browse', this.renderSettings, this );
+			view.updateSave( requests.state() === 'resolved' ? 'complete' : 'error' );
+			save.savedTimer = setTimeout( function() {
+				view.updateSave('ready');
+				delete save.savedTimer;
+			}, 2000 );
+		});
+	},
+	/**
+	 * @param {string} status
+	 * @returns {wp.media.view.Attachment} Returns itself to allow chaining
+	 */
+	updateSave: function( status ) {
+		var save = this._save = this._save || { status: 'ready' };
 
-		Library.prototype.activate.apply( this, arguments );
+		if ( status && status !== save.status ) {
+			this.$el.removeClass( 'save-' + save.status );
+			save.status = status;
+		}
+
+		this.$el.addClass( 'save-' + save.status );
+		return this;
 	},
 
+	updateAll: function() {
+		var $settings = this.$('[data-setting]'),
+			model = this.model,
+			changed;
+
+		changed = _.chain( $settings ).map( function( el ) {
+			var $input = $('input, textarea, select, [value]', el ),
+				setting, value;
+
+			if ( ! $input.length ) {
+				return;
+			}
+
+			setting = $(el).data('setting');
+			value = $input.val();
+
+			// Record the value if it changed.
+			if ( model.get( setting ) !== value ) {
+				return [ setting, value ];
+			}
+		}).compact().object().value();
+
+		if ( ! _.isEmpty( changed ) ) {
+			model.save( changed );
+		}
+	},
 	/**
-	 * @since 3.9.0
+	 * @param {Object} event
 	 */
-	deactivate: function() {
-		// Stop watching for uploaded attachments.
-		this.get('library').unobserve( wp.Uploader.queue );
+	removeFromLibrary: function( event ) {
+		// Catch enter and space events
+		if ( 'keydown' === event.type && 13 !== event.keyCode && 32 !== event.keyCode ) {
+			return;
+		}
 
-		this.frame.off( 'content:render:browse', this.renderSettings, this );
+		// Stop propagation so the model isn't selected.
+		event.stopPropagation();
 
-		Library.prototype.deactivate.apply( this, arguments );
+		this.collection.remove( this.model );
 	},
 
 	/**
-	 * 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
+	 * Add the model if it isn't in the selection, if it is in the selection,
+	 * remove it.
 	 *
-	 * @param {wp.media.view.attachmentsBrowser} The attachments browser view.
+	 * @param  {[type]} event [description]
+	 * @return {[type]}       [description]
 	 */
-	renderSettings: function( attachmentsBrowserView ) {
-		var library = this.get('library'),
-			collectionType = this.get('collectionType'),
-			dragInfoText = this.get('dragInfoText'),
-			SettingsView = this.get('SettingsView'),
-			obj = {};
-
-		if ( ! library || ! attachmentsBrowserView ) {
+	checkClickHandler: function ( event ) {
+		var selection = this.options.selection;
+		if ( ! selection ) {
 			return;
 		}
+		event.stopPropagation();
+		if ( selection.where( { id: this.model.get( 'id' ) } ).length ) {
+			selection.remove( this.model );
+			// Move focus back to the attachment tile (from the check).
+			this.$el.focus();
+		} else {
+			selection.add( this.model );
+		}
+	}
+});
 
-		library[ collectionType ] = library[ collectionType ] || new Backbone.Model();
-
-		obj[ collectionType ] = new SettingsView({
-			controller: this,
-			model:      library[ collectionType ],
-			priority:   40
-		});
-
-		attachmentsBrowserView.sidebar.set( obj );
+// Ensure settings remain in sync between attachment views.
+_.each({
+	caption: '_syncCaption',
+	title:   '_syncTitle',
+	artist:  '_syncArtist',
+	album:   '_syncAlbum'
+}, function( method, setting ) {
+	/**
+	 * @param {Backbone.Model} model
+	 * @param {string} value
+	 * @returns {wp.media.view.Attachment} Returns itself to allow chaining
+	 */
+	Attachment.prototype[ method ] = function( model, value ) {
+		var $setting = this.$('[data-setting="' + setting + '"]');
 
-		if ( dragInfoText ) {
-			attachmentsBrowserView.toolbar.set( 'dragInfo', new wp.media.View({
-				el: $( '<div class="instructions">' + dragInfoText + '</div>' )[0],
-				priority: -40
-			}) );
+		if ( ! $setting.length ) {
+			return this;
 		}
 
-		// Add the 'Reverse order' button to the toolbar.
-		attachmentsBrowserView.toolbar.set( 'reverse', {
-			text:     l10n.reverseOrder,
-			priority: 80,
+		// 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;
+		}
 
-			click: function() {
-				library.reset( library.toArray().reverse() );
-			}
-		});
-	}
+		return this.render();
+	};
 });
 
-module.exports = CollectionEdit;
-
-
-/***/ }),
-/* 36 */
-/***/ (function(module, exports) {
+module.exports = Attachment;
 
+},{}],26:[function(require,module,exports){
 /**
- * wp.media.controller.CollectionAdd
- *
- * A state for adding attachments to a collection (e.g. video playlist).
+ * wp.media.view.Attachment.Details
  *
  * @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').
+ * @augments wp.media.view.Attachment
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
  */
-var Selection = wp.media.model.Selection,
-	Library = wp.media.controller.Library,
-	CollectionAdd;
+var Attachment = wp.media.view.Attachment,
+	l10n = wp.media.view.l10n,
+	Details;
 
-CollectionAdd = Library.extend({
-	defaults: _.defaults( {
-		// Selection defaults. @see media.model.Selection
-		multiple:      'add',
-		// Attachments browser defaults. @see media.view.AttachmentsBrowser
-		filterable:    'uploaded',
+Details = Attachment.extend({
+	tagName:   'div',
+	className: 'attachment-details',
+	template:  wp.template('attachment-details'),
 
-		priority:      100,
-		syncSelection: false
-	}, Library.prototype.defaults ),
+	attributes: function() {
+		return {
+			'tabIndex':     0,
+			'data-id':      this.model.get( 'id' )
+		};
+	},
+
+	events: {
+		'change [data-setting]':          'updateSetting',
+		'change [data-setting] input':    'updateSetting',
+		'change [data-setting] select':   'updateSetting',
+		'change [data-setting] textarea': 'updateSetting',
+		'click .delete-attachment':       'deleteAttachment',
+		'click .trash-attachment':        'trashAttachment',
+		'click .untrash-attachment':      'untrashAttachment',
+		'click .edit-attachment':         'editAttachment',
+		'keydown':                        'toggleSelectionHandler'
+	},
+
+	initialize: function() {
+		this.options = _.defaults( this.options, {
+			rerenderOnModelChange: false
+		});
+
+		this.on( 'ready', this.initialFocus );
+		// Call 'initialize' directly on the parent class.
+		Attachment.prototype.initialize.apply( this, arguments );
+	},
 
+	initialFocus: function() {
+		if ( ! wp.media.isTouchDevice ) {
+			/*
+			Previously focused the first ':input' (the readonly URL text field).
+			Since the first ':input' is now a button (delete/trash): when pressing
+			spacebar on an attachment, Firefox fires deleteAttachment/trashAttachment
+			as soon as focus is moved. Explicitly target the first text field for now.
+			@todo change initial focus logic, also for accessibility.
+			*/
+			this.$( 'input[type="text"]' ).eq( 0 ).focus();
+		}
+	},
 	/**
-	 * @since 3.9.0
+	 * @param {Object} event
 	 */
-	initialize: function() {
-		var collectionType = this.get('collectionType');
+	deleteAttachment: function( event ) {
+		event.preventDefault();
 
-		if ( 'video' === this.get( 'type' ) ) {
-			collectionType = 'video-' + collectionType;
+		if ( window.confirm( l10n.warnDelete ) ) {
+			this.model.destroy();
+			// Keep focus inside media modal
+			// after image is deleted
+			this.controller.modal.focusManager.focus();
 		}
+	},
+	/**
+	 * @param {Object} event
+	 */
+	trashAttachment: function( event ) {
+		var library = this.controller.library;
+		event.preventDefault();
 
-		this.set( 'id', collectionType + '-library' );
-		this.set( 'toolbar', collectionType + '-add' );
-		this.set( 'menu', collectionType );
+		if ( wp.media.view.settings.mediaTrash &&
+			'edit-metadata' === this.controller.content.mode() ) {
 
-		// 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') }) );
+			this.model.set( 'status', 'trash' );
+			this.model.save().done( function() {
+				library._requery( true );
+			} );
+		}  else {
+			this.model.destroy();
 		}
-		Library.prototype.initialize.apply( this, arguments );
 	},
+	/**
+	 * @param {Object} event
+	 */
+	untrashAttachment: function( event ) {
+		var library = this.controller.library;
+		event.preventDefault();
 
+		this.model.set( 'status', 'inherit' );
+		this.model.save().done( function() {
+			library._requery( true );
+		} );
+	},
 	/**
-	 * @since 3.9.0
+	 * @param {Object} event
 	 */
-	activate: function() {
-		var library = this.get('library'),
-			editLibrary = this.get('editLibrary'),
-			edit = this.frame.state( this.get('collectionType') + '-edit' ).get('library');
+	editAttachment: function( event ) {
+		var editState = this.controller.states.get( 'edit-image' );
+		if ( window.imageEdit && editState ) {
+			event.preventDefault();
 
-		if ( editLibrary && editLibrary !== edit ) {
-			library.unobserve( editLibrary );
+			editState.set( 'image', this.model );
+			this.controller.setState( 'edit-image' );
+		} else {
+			this.$el.addClass('needs-refresh');
+		}
+	},
+	/**
+	 * When reverse tabbing(shift+tab) out of the right details panel, deliver
+	 * the focus to the item in the list that was being edited.
+	 *
+	 * @param {Object} event
+	 */
+	toggleSelectionHandler: function( event ) {
+		if ( 'keydown' === event.type && 9 === event.keyCode && event.shiftKey && event.target === this.$( ':tabbable' ).get( 0 ) ) {
+			this.controller.trigger( 'attachment:details:shift-tab', event );
+			return false;
 		}
 
-		// Accepts attachments that exist in the original library and
-		// that do not exist in gallery's library.
-		library.validator = function( attachment ) {
-			return !! this.mirroring.get( attachment.cid ) && ! edit.get( attachment.cid ) && Selection.prototype.validator.apply( this, arguments );
-		};
+		if ( 37 === event.keyCode || 38 === event.keyCode || 39 === event.keyCode || 40 === event.keyCode ) {
+			this.controller.trigger( 'attachment:keydown:arrow', event );
+			return;
+		}
+	}
+});
 
-		// 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);
+module.exports = Details;
 
-		Library.prototype.activate.apply( this, arguments );
+},{}],27:[function(require,module,exports){
+/**
+ * wp.media.view.Attachment.EditLibrary
+ *
+ * @class
+ * @augments wp.media.view.Attachment
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var EditLibrary = wp.media.view.Attachment.extend({
+	buttons: {
+		close: true
 	}
 });
 
-module.exports = CollectionAdd;
+module.exports = EditLibrary;
 
+},{}],28:[function(require,module,exports){
+/**
+ * wp.media.view.Attachments.EditSelection
+ *
+ * @class
+ * @augments wp.media.view.Attachment.Selection
+ * @augments wp.media.view.Attachment
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var EditSelection = wp.media.view.Attachment.Selection.extend({
+	buttons: {
+		close: true
+	}
+});
 
-/***/ }),
-/* 37 */
-/***/ (function(module, exports) {
+module.exports = EditSelection;
 
+},{}],29:[function(require,module,exports){
 /**
- * wp.media.controller.FeaturedImage
+ * wp.media.view.Attachment.Library
  *
- * A state for selecting a featured image for a post.
+ * @class
+ * @augments wp.media.view.Attachment
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Library = wp.media.view.Attachment.extend({
+	buttons: {
+		check: true
+	}
+});
+
+module.exports = Library;
+
+},{}],30:[function(require,module,exports){
+/**
+ * wp.media.view.Attachment.Selection
  *
  * @class
- * @augments wp.media.controller.Library
- * @augments wp.media.controller.State
- * @augments Backbone.Model
+ * @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
  *
- * @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.
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
  */
-var Attachment = wp.media.model.Attachment,
-	Library = wp.media.controller.Library,
-	l10n = wp.media.view.l10n,
-	FeaturedImage;
+var View = wp.media.View,
+	$ = jQuery,
+	Attachments;
 
-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 ),
+Attachments = View.extend({
+	tagName:   'ul',
+	className: 'attachments',
+
+	attributes: {
+		tabIndex: -1
+	},
 
-	/**
-	 * @since 3.5.0
-	 */
 	initialize: function() {
-		var library, comparator;
+		this.el.id = _.uniqueId('__attachments-view-');
 
-		// If we haven't been provided a `library`, create a `Selection`.
-		if ( ! this.get('library') ) {
-			this.set( 'library', wp.media.query({ type: 'image' }) );
-		}
+		_.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
+		});
 
-		Library.prototype.initialize.apply( this, arguments );
+		this._viewsByCid = {};
+		this.$window = $( window );
+		this.resizeEvent = 'resize.media-modal-columns';
 
-		library    = this.get('library');
-		comparator = library.comparator;
+		this.collection.on( 'add', function( attachment ) {
+			this.views.add( this.createAttachmentView( attachment ), {
+				at: this.collection.indexOf( attachment )
+			});
+		}, this );
 
-		// 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 );
+		this.collection.on( 'remove', function( attachment ) {
+			var view = this._viewsByCid[ attachment.cid ];
+			delete this._viewsByCid[ attachment.cid ];
 
-			if ( ! aInQuery && bInQuery ) {
-				return -1;
-			} else if ( aInQuery && ! bInQuery ) {
-				return 1;
-			} else {
-				return comparator.apply( this, arguments );
+			if ( view ) {
+				view.remove();
 			}
-		};
+		}, this );
 
-		// 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') );
-	},
+		this.collection.on( 'reset', this.render, this );
 
-	/**
-	 * @since 3.5.0
-	 */
-	activate: function() {
-		this.updateSelection();
-		this.frame.on( 'open', this.updateSelection, this );
+		this.listenTo( this.controller, 'library:selection:add',    this.attachmentFocus );
 
-		Library.prototype.activate.apply( this, arguments );
+		// 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 );
+		}
 	},
 
-	/**
-	 * @since 3.5.0
-	 */
-	deactivate: function() {
-		this.frame.off( 'open', this.updateSelection, this );
+	bindEvents: function() {
+		this.$window.off( this.resizeEvent ).on( this.resizeEvent, _.debounce( this.setColumns, 50 ) );
+	},
 
-		Library.prototype.deactivate.apply( this, arguments );
+	attachmentFocus: function() {
+		this.$( 'li:first' ).focus();
 	},
 
-	/**
-	 * @since 3.5.0
-	 */
-	updateSelection: function() {
-		var selection = this.get('selection'),
-			id = wp.media.view.settings.post.featuredImageId,
-			attachment;
+	restoreFocus: function() {
+		this.$( 'li.selected:first' ).focus();
+	},
 
-		if ( '' !== id && -1 !== id ) {
-			attachment = Attachment.get( id );
-			attachment.fetch();
+	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;
 		}
 
-		selection.reset( attachment ? [ attachment ] : [] );
-	}
-});
+		// Left arrow
+		if ( 37 === event.keyCode ) {
+			if ( 0 === index ) {
+				return;
+			}
+			attachments.eq( index - 1 ).focus();
+		}
 
-module.exports = FeaturedImage;
+		// Up arrow
+		if ( 38 === event.keyCode ) {
+			if ( 1 === row ) {
+				return;
+			}
+			attachments.eq( index - perRow ).focus();
+		}
 
+		// Right arrow
+		if ( 39 === event.keyCode ) {
+			if ( attachments.length === index ) {
+				return;
+			}
+			attachments.eq( index + 1 ).focus();
+		}
 
-/***/ }),
-/* 38 */
-/***/ (function(module, exports) {
+		// Down arrow
+		if ( 40 === event.keyCode ) {
+			if ( Math.ceil( attachments.length / perRow ) === row ) {
+				return;
+			}
+			attachments.eq( index + perRow ).focus();
+		}
+	},
 
-/**
- * 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;
+	dispose: function() {
+		this.collection.props.off( null, null, this );
+		if ( this.options.resize ) {
+			this.$window.off( this.resizeEvent );
+		}
 
-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 ),
+		/**
+		 * call 'dispose' directly on the parent class
+		 */
+		View.prototype.dispose.apply( this, arguments );
+	},
 
-	/**
-	 * @since 3.9.0
-	 *
-	 * @param options
-	 */
-	initialize: function( options ) {
-		var library, comparator;
+	setColumns: function() {
+		var prev = this.columns,
+			width = this.$el.width();
 
-		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' }) );
+		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 );
+			}
 		}
+	},
 
-		Library.prototype.initialize.apply( this, arguments );
+	initSortable: function() {
+		var collection = this.collection;
 
-		library    = this.get('library');
-		comparator = library.comparator;
+		if ( wp.media.isTouchDevice || ! this.options.sortable || ! $.fn.sortable ) {
+			return;
+		}
 
-		// 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 );
+		this.$el.sortable( _.extend({
+			// If the `collection` has a `comparator`, disable sorting.
+			disabled: !! collection.comparator,
 
-			if ( ! aInQuery && bInQuery ) {
-				return -1;
-			} else if ( aInQuery && ! bInQuery ) {
-				return 1;
-			} else {
-				return comparator.apply( this, arguments );
+			// Change the position of the attachment as soon as the
+			// mouse pointer overlaps a thumbnail.
+			tolerance: 'pointer',
+
+			// Record the initial `index` of the dragged model.
+			start: function( event, ui ) {
+				ui.item.data('sortableIndexStart', ui.item.index());
+			},
+
+			// Update the model's index in the collection.
+			// Do so silently, as the view is already accurate.
+			update: function( event, ui ) {
+				var model = collection.at( ui.item.data('sortableIndexStart') ),
+					comparator = collection.comparator;
+
+				// Temporarily disable the comparator to prevent `add`
+				// from re-sorting.
+				delete collection.comparator;
+
+				// Silently shift the model to its new index.
+				collection.remove( model, {
+					silent: true
+				});
+				collection.add( model, {
+					silent: true,
+					at:     ui.item.index()
+				});
+
+				// Restore the comparator.
+				collection.comparator = comparator;
+
+				// Fire the `reset` event to ensure other collections sync.
+				collection.trigger( 'reset', collection );
+
+				// If the collection is sorted by menu order,
+				// update the menu order.
+				collection.saveMenuOrder();
 			}
-		};
+		}, this.options.sortable ) );
 
-		// 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') );
+		// 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();
 	},
 
-	/**
-	 * @since 3.9.0
-	 */
-	activate: function() {
-		this.updateSelection();
-		Library.prototype.activate.apply( this, arguments );
+	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 );
 	},
 
 	/**
-	 * @since 3.9.0
+	 * @param {wp.media.model.Attachment} attachment
+	 * @returns {wp.media.View}
 	 */
-	updateSelection: function() {
-		var selection = this.get('selection'),
-			attachment = this.image.attachment;
+	createAttachmentView: function( attachment ) {
+		var view = new this.options.AttachmentView({
+			controller:           this.controller,
+			model:                attachment,
+			collection:           this.collection,
+			selection:            this.options.selection
+		});
 
-		selection.reset( attachment ? [ attachment ] : [] );
-	}
-});
+		return this._viewsByCid[ attachment.cid ] = view;
+	},
 
-module.exports = ReplaceImage;
+	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 );
+		}
+	},
 
-/***/ }),
-/* 39 */
-/***/ (function(module, exports) {
+	ready: function() {
+		// Trigger the scroll event to check if we're within the
+		// threshold to query for additional attachments.
+		this.scroll();
+	},
 
+	scroll: function() {
+		var view = this,
+			el = this.options.scrollElement,
+			scrollTop = el.scrollTop,
+			toolbar;
+
+		// The scroll event occurs on the document, but the element
+		// that should be checked is the document body.
+		if ( el === document ) {
+			el = document.body;
+			scrollTop = $(document).scrollTop();
+		}
+
+		if ( ! $(el).is(':visible') || ! this.collection.hasMore() ) {
+			return;
+		}
+
+		toolbar = this.views.parent.toolbar;
+
+		// Show the spinner only if we are close to the bottom.
+		if ( el.scrollHeight - ( scrollTop + el.clientHeight ) < el.clientHeight / 3 ) {
+			toolbar.get('spinner').show();
+		}
+
+		if ( el.scrollHeight < scrollTop + ( el.clientHeight * this.options.refreshThreshold ) ) {
+			this.collection.more().done(function() {
+				view.scroll();
+				toolbar.get('spinner').hide();
+			});
+		}
+	}
+});
+
+module.exports = Attachments;
+
+},{}],32:[function(require,module,exports){
 /**
- * wp.media.controller.EditImage
- *
- * A state for editing (cropping, etc.) an image.
+ * wp.media.view.AttachmentsBrowser
  *
  * @class
- * @augments wp.media.controller.State
- * @augments Backbone.Model
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
  *
- * @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.
+ * @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'.
  */
-var l10n = wp.media.view.l10n,
-	EditImage;
+var View = wp.media.View,
+	mediaTrash = wp.media.view.settings.mediaTrash,
+	l10n = wp.media.view.l10n,
+	$ = jQuery,
+	AttachmentsBrowser;
 
-EditImage = wp.media.controller.State.extend({
-	defaults: {
-		id:      'edit-image',
-		title:   l10n.editImage,
-		menu:    false,
-		toolbar: 'edit-image',
-		content: 'edit-image',
-		url:     ''
+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 );
 	},
 
-	/**
-	 * @since 3.9.0
-	 */
-	activate: function() {
-		this.listenTo( this.frame, 'toolbar:render:edit-image', this.toolbar );
+	editSelection: function( modal ) {
+		modal.$( '.media-button-backToLibrary' ).focus();
 	},
 
 	/**
-	 * @since 3.9.0
+	 * @returns {wp.media.view.AttachmentsBrowser} Returns itself to allow chaining
 	 */
-	deactivate: function() {
-		this.stopListening( this.frame );
+	dispose: function() {
+		this.options.selection.off( null, null, this );
+		View.prototype.dispose.apply( this, arguments );
+		return this;
 	},
 
-	/**
-	 * @since 3.9.0
-	 */
-	toolbar: function() {
-		var frame = this.frame,
-			lastState = frame.lastState(),
-			previous = lastState && lastState.id;
+	createToolbar: function() {
+		var LibraryViewSwitcher, Filters, toolbarOptions;
 
-		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 );
+		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 );
 						} else {
-							frame.close();
+							model.destroy({wait: true});
 						}
+					} );
+
+					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' );
 					}
 				}
+			}).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() );
 			}
+
+		} 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
+		}) );
+
+		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' );
 	}
 });
 
-module.exports = EditImage;
+module.exports = AttachmentsBrowser;
 
+},{}],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;
+
+Selection = Attachments.extend({
+	events: {},
+	initialize: function() {
+		_.defaults( this.options, {
+			sortable:   false,
+			resize:     false,
+
+			// 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 );
+	}
+});
 
-/***/ }),
-/* 40 */
-/***/ (function(module, exports) {
+module.exports = Selection;
 
+},{}],34:[function(require,module,exports){
 /**
- * wp.media.controller.MediaLibrary
+ * wp.media.view.ButtonGroup
  *
  * @class
- * @augments wp.media.controller.Library
- * @augments wp.media.controller.State
- * @augments Backbone.Model
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
  */
-var Library = wp.media.controller.Library,
-	MediaLibrary;
+var $ = Backbone.$,
+	ButtonGroup;
 
-MediaLibrary = Library.extend({
-	defaults: _.defaults({
-		// Attachments browser defaults. @see media.view.AttachmentsBrowser
-		filterable:      'uploaded',
+ButtonGroup = wp.media.View.extend({
+	tagName:   'div',
+	className: 'button-group button-large media-button-group',
 
-		displaySettings: false,
-		priority:        80,
-		syncSelection:   false
-	}, Library.prototype.defaults ),
+	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();
+			}
+		});
 
-	/**
-	 * @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 }) );
+		delete this.options.buttons;
 
-		Library.prototype.initialize.apply( this, arguments );
+		if ( this.options.classes ) {
+			this.$el.addClass( this.options.classes );
+		}
 	},
 
 	/**
-	 * @since 3.9.0
+	 * @returns {wp.media.view.ButtonGroup}
 	 */
-	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 );
+	render: function() {
+		this.$el.html( $( _.pluck( this.buttons, 'el' ) ).detach() );
+		return this;
 	}
 });
 
-module.exports = MediaLibrary;
-
-
-/***/ }),
-/* 41 */
-/***/ (function(module, exports) {
+module.exports = ButtonGroup;
 
+},{}],35:[function(require,module,exports){
 /**
- * wp.media.controller.Embed
- *
- * A state for embedding media from a URL.
+ * wp.media.view.Button
  *
  * @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.
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
  */
-var l10n = wp.media.view.l10n,
-	$ = Backbone.$,
-	Embed;
+var Button = wp.media.View.extend({
+	tagName:    'button',
+	className:  'media-button',
+	attributes: { type: 'button' },
+
+	events: {
+		'click': 'click'
+	},
 
-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: {}
+		text:     '',
+		style:    '',
+		size:     'large',
+		disabled: false
 	},
 
-	// The amount of time used when debouncing the scan.
-	sensitivity: 400,
+	initialize: function() {
+		/**
+		 * Create a model with the provided `defaults`.
+		 *
+		 * @member {Backbone.Model}
+		 */
+		this.model = new Backbone.Model( this.defaults );
 
-	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 );
-	},
+		// 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 );
+	},
 	/**
-	 * Trigger a scan of the embedded URL's content for metadata required to embed.
-	 *
-	 * @fires wp.media.controller.Embed#scan
+	 * @returns {wp.media.view.Button} Returns itself to allow chaining
 	 */
-	scan: function() {
-		var scanners,
-			embed = this,
-			attributes = {
-				type: 'link',
-				scanners: []
-			};
+	render: function() {
+		var classes = [ 'button', this.className ],
+			model = this.model.toJSON();
 
-		// Scan is triggered with the list of `attributes` to set on the
-		// state, useful for the 'type' attribute and 'scanners' attribute,
-		// an array of promise objects for asynchronous scan operations.
-		if ( this.props.get('url') ) {
-			this.trigger( 'scan', attributes );
+		if ( model.style ) {
+			classes.push( 'button-' + model.style );
 		}
 
-		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;
+		if ( model.size ) {
+			classes.push( 'button-' + model.size );
 		}
 
-		attributes.loading = !! attributes.scanners;
-		this.set( attributes );
+		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;
 	},
 	/**
-	 * Try scanning the embed as an image to discover its dimensions.
-	 *
-	 * @param {Object} attributes
+	 * @param {Object} event
 	 */
-	scanImage: function( attributes ) {
-		var frame = this.frame,
-			state = this,
-			url = this.props.get('url'),
-			image = new Image(),
-			deferred = $.Deferred();
-
-		attributes.scanners.push( deferred.promise() );
+	click: function( event ) {
+		if ( '#' === this.attributes.href ) {
+			event.preventDefault();
+		}
 
-		// Try to load the image and find its width/height.
-		image.onload = function() {
-			deferred.resolve();
+		if ( this.options.click && ! this.model.get('disabled') ) {
+			this.options.click.apply( this, arguments );
+		}
+	}
+});
 
-			if ( state !== frame.state() || url !== state.props.get('url') ) {
-				return;
-			}
+module.exports = Button;
 
-			state.set({
-				type: 'image'
-			});
+},{}],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;
 
-			state.props.set({
-				width:  image.width,
-				height: image.height
-			});
+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')
 		};
-
-		image.onerror = deferred.reject;
-		image.src = url;
 	},
+	onImageLoad: function() {
+		var imgOptions = this.controller.get('imgSelectOptions');
+		if (typeof imgOptions === 'function') {
+			imgOptions = imgOptions(this.options.attachment, this.controller);
+		}
 
-	refresh: function() {
-		this.frame.toolbar.get().refresh();
+		imgOptions = _.extend(imgOptions, {parent: this.$el});
+		this.trigger('image-loaded');
+		this.controller.imgSelect = this.$image.imgAreaSelect(imgOptions);
 	},
+	onError: function() {
+		var filename = this.options.attachment.get('filename');
 
-	reset: function() {
-		this.props.clear().set({ url: '' });
-
-		if ( this.active ) {
-			this.refresh();
-		}
+		this.views.add( '.upload-errors', new wp.media.view.UploaderStatusError({
+			filename: UploaderStatus.prototype.filename(filename),
+			message: window._wpMediaViewsL10n.cropError
+		}), { at: 0 });
 	}
 });
 
-module.exports = Embed;
-
-
-/***/ }),
-/* 42 */
-/***/ (function(module, exports) {
+module.exports = Cropper;
 
+},{}],37:[function(require,module,exports){
 /**
- * wp.media.controller.Cropper
- *
- * A state for cropping an image.
+ * wp.media.view.EditImage
  *
  * @class
- * @augments wp.media.controller.State
- * @augments Backbone.Model
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
  */
-var l10n = wp.media.view.l10n,
-	Cropper;
+var View = wp.media.View,
+	EditImage;
 
-Cropper = wp.media.controller.State.extend({
-	defaults: {
-		id:          'cropper',
-		title:       l10n.cropImage,
-		// Region mode defaults.
-		toolbar:     'crop',
-		content:     'crop',
-		router:      false,
+EditImage = View.extend({
+	className: 'image-editor',
+	template: wp.template('image-editor'),
 
-		canSkipCrop: false
+	initialize: function( options ) {
+		this.editor = window.imageEdit;
+		this.controller = options.controller;
+		View.prototype.initialize.apply( this, arguments );
 	},
 
-	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));
+	prepare: function() {
+		return this.model.toJSON();
 	},
 
-	deactivate: function() {
-		this.frame.toolbar.mode('browse');
+	loadEditor: function() {
+		var dfd = this.editor.open( this.model.get('id'), this.model.get('nonces').edit, this );
+		dfd.done( _.bind( this.focus, this ) );
 	},
 
-	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);
+	focus: function() {
+		this.$( '.imgedit-submit .button' ).eq( 0 ).focus();
+	},
 
+	back: function() {
+		var lastState = this.controller.lastState();
+		this.controller.setState( lastState );
 	},
-	removeCropper: function() {
-		this.imgSelect.cancelSelection();
-		this.imgSelect.setOptions({remove: true});
-		this.imgSelect.update();
-		this.cropperView.remove();
+
+	refresh: function() {
+		this.model.fetch();
 	},
-	createCropToolbar: function() {
-		var canSkipCrop, toolbarOptions;
 
-		canSkipCrop = this.get('canSkipCrop') || false;
+	save: function() {
+		var lastState = this.controller.lastState();
 
-		toolbarOptions = {
-			controller: this.frame,
-			items: {
-				insert: {
-					style:    'primary',
-					text:     l10n.cropImage,
-					priority: 80,
-					requires: { library: false, selection: false },
+		this.model.fetch().done( _.bind( function() {
+			this.controller.setState( lastState );
+		}, this ) );
+	}
 
-					click: function() {
-						var controller = this.controller,
-							selection;
+});
 
-						selection = controller.state().get('selection').first();
-						selection.set({cropDetails: controller.state().imgSelect.getSelection()});
+module.exports = EditImage;
 
-						this.$el.text(l10n.cropping);
-						this.$el.attr('disabled', true);
+},{}],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',
 
-						controller.state().doCrop( selection ).done( function( croppedImage ) {
-							controller.trigger('cropped', croppedImage );
-							controller.close();
-						}).fail( function() {
-							controller.trigger('content:error:crop');
-						});
-					}
-				}
-			}
-		};
+	initialize: function() {
+		/**
+		 * @member {wp.media.view.EmbedUrl}
+		 */
+		this.url = new wp.media.view.EmbedUrl({
+			controller: this.controller,
+			model:      this.model.props
+		}).render();
 
-		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.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();
+		}
+		this._settings = view;
+		this.views.add( view );
+	},
+
+	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.frame.toolbar.set( new wp.media.view.Toolbar(toolbarOptions) );
+		this.settings( new constructor({
+			controller: this.controller,
+			model:      this.model.props,
+			priority:   40
+		}) );
 	},
 
-	doCrop: function( attachment ) {
-		return wp.ajax.post( 'custom-header-crop', {
-			nonce: attachment.get('nonces').edit,
-			id: attachment.get('id'),
-			cropDetails: attachment.get('cropDetails')
-		} );
+	loading: function() {
+		this.$el.toggleClass( 'embed-loading', this.model.get('loading') );
 	}
 });
 
-module.exports = Cropper;
-
-
-/***/ }),
-/* 43 */
-/***/ (function(module, exports) {
+module.exports = Embed;
 
+},{}],39:[function(require,module,exports){
 /**
- * wp.media.controller.CustomizeImageCropper
- *
- * A state for cropping an image.
+ * wp.media.view.EmbedImage
  *
  * @class
- * @augments wp.media.controller.Cropper
- * @augments wp.media.controller.State
- * @augments Backbone.Model
+ * @augments wp.media.view.Settings.AttachmentDisplay
+ * @augments wp.media.view.Settings
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
  */
-var Controller = wp.media.controller,
-	CustomizeImageCropper;
+var AttachmentDisplay = wp.media.view.Settings.AttachmentDisplay,
+	EmbedImage;
 
-CustomizeImageCropper = Controller.Cropper.extend({
-	doCrop: function( attachment ) {
-		var cropDetails = attachment.get( 'cropDetails' ),
-			control = this.get( 'control' );
+EmbedImage = AttachmentDisplay.extend({
+	className: 'embed-media-settings',
+	template:  wp.template('embed-image-settings'),
 
-		cropDetails.dst_width  = control.params.width;
-		cropDetails.dst_height = control.params.height;
+	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 );
+	},
 
-		return wp.ajax.post( 'crop-image', {
-			wp_customize: 'on',
-			nonce: attachment.get( 'nonces' ).edit,
-			id: attachment.get( 'id' ),
-			context: control.id,
-			cropDetails: cropDetails
-		} );
+	updateImage: function() {
+		this.$('img').attr( 'src', this.model.get('url') );
 	}
 });
 
-module.exports = CustomizeImageCropper;
-
-
-/***/ }),
-/* 44 */
-/***/ (function(module, exports) {
+module.exports = EmbedImage;
 
+},{}],40:[function(require,module,exports){
 /**
- * wp.media.controller.SiteIconCropper
- *
- * A state for cropping a Site Icon.
+ * wp.media.view.EmbedLink
  *
  * @class
- * @augments wp.media.controller.Cropper
- * @augments wp.media.controller.State
- * @augments Backbone.Model
+ * @augments wp.media.view.Settings
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
  */
-var Controller = wp.media.controller,
-	SiteIconCropper;
+var $ = jQuery,
+	EmbedLink;
 
-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));
+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 );
 	},
 
-	createCropContent: function() {
-		this.cropperView = new wp.media.view.SiteIconCropper({
-			controller: this,
-			attachment: this.get('selection').first()
+	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')
 		});
-		this.cropperView.on('image-loaded', this.createCropToolbar, this);
-		this.frame.content.set(this.cropperView);
 
+		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 );
 	},
 
-	doCrop: function( attachment ) {
-		var cropDetails = attachment.get( 'cropDetails' ),
-			control = this.get( 'control' );
+	renderFail: function ( response, status ) {
+		if ( 'abort' === status ) {
+			return;
+		}
+		this.$( '.link-text' ).show();
+	},
 
-		cropDetails.dst_width  = control.params.width;
-		cropDetails.dst_height = control.params.height;
+	renderoEmbed: function( response ) {
+		var html = ( response && response.data && response.data.body ) || '';
 
-		return wp.ajax.post( 'crop-image', {
-			nonce: attachment.get( 'nonces' ).edit,
-			id: attachment.get( 'id' ),
-			context: 'site-icon',
-			cropDetails: cropDetails
-		} );
+		if ( html ) {
+			this.$('.embed-container').show().find('.embed-preview').html( html );
+		} else {
+			this.renderFail();
+		}
 	}
 });
 
-module.exports = SiteIconCropper;
-
-
-/***/ }),
-/* 45 */
-/***/ (function(module, exports) {
+module.exports = EmbedLink;
 
+},{}],41:[function(require,module,exports){
 /**
- * wp.media.View
- *
- * The base view class for media.
- *
- * Undelegating events, removing events from the model, and
- * removing events from the controller mirror the code for
- * `Backbone.View.dispose` in Backbone 0.9.8 development.
- *
- * This behavior has since been removed, and should not be used
- * outside of the media manager.
+ * wp.media.view.EmbedUrl
  *
  * @class
+ * @augments wp.media.View
  * @augments wp.Backbone.View
  * @augments Backbone.View
  */
-var View = wp.Backbone.View.extend({
-	constructor: function( options ) {
-		if ( options && options.controller ) {
-			this.controller = options.controller;
+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 );
 		}
-		wp.Backbone.View.apply( this, arguments );
 	},
 	/**
-	 * @todo The internal comment mentions this might have been a stop-gap
-	 *       before Backbone 0.9.8 came out. Figure out if Backbone core takes
-	 *       care of this in Backbone.View now.
-	 *
-	 * @returns {wp.media.View} Returns itself to allow chaining
+	 * @returns {wp.media.view.EmbedUrl} Returns itself to allow chaining
 	 */
-	dispose: function() {
-		// Undelegating events, removing events from the model, and
-		// removing events from the controller mirror the code for
-		// `Backbone.View.dispose` in Backbone 0.9.8 development.
-		this.undelegateEvents();
+	render: function() {
+		var $input = this.$input;
 
-		if ( this.model && this.model.off ) {
-			this.model.off( null, null, this );
+		if ( $input.is(':focus') ) {
+			return;
 		}
 
-		if ( this.collection && this.collection.off ) {
-			this.collection.off( null, null, this );
-		}
+		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;
+	},
 
-		// Unbind controller events.
-		if ( this.controller && this.controller.off ) {
-			this.controller.off( null, null, this );
+	ready: function() {
+		if ( ! wp.media.isTouchDevice ) {
+			this.focus();
 		}
+	},
 
-		return this;
+	url: function( event ) {
+		this.model.set( 'url', event.target.value );
 	},
+
 	/**
-	 * @returns {wp.media.View} Returns itself to allow chaining
+	 * If the input is visible, focus and select its contents.
 	 */
-	remove: function() {
-		this.dispose();
-		/**
-		 * call 'remove' directly on the parent class
-		 */
-		return wp.Backbone.View.prototype.remove.apply( this, arguments );
+	focus: function() {
+		var $input = this.$input;
+		if ( $input.is(':visible') ) {
+			$input.focus()[0].select();
+		}
 	}
 });
 
-module.exports = View;
+module.exports = EmbedUrl;
 
+},{}],42:[function(require,module,exports){
+/**
+ * wp.media.view.FocusManager
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var FocusManager = wp.media.View.extend({
 
-/***/ }),
-/* 46 */
-/***/ (function(module, exports) {
+	events: {
+		'keydown': 'constrainTabbing'
+	},
+
+	focus: function() { // Reset focus on first left menu item
+		this.$('.media-menu-item').first().focus();
+	},
+	/**
+	 * @param {Object} event
+	 */
+	constrainTabbing: function( event ) {
+		var tabbables;
+
+		// Look for the tab key.
+		if ( 9 !== event.keyCode ) {
+			return;
+		}
 
+		// Skip the file input added by Plupload.
+		tabbables = this.$( ':tabbable' ).not( '.moxie-shim input[type="file"]' );
+
+		// Keep tab focus within media modal while it's open
+		if ( tabbables.last()[0] === event.target && ! event.shiftKey ) {
+			tabbables.first().focus();
+			return false;
+		} else if ( tabbables.first()[0] === event.target && event.shiftKey ) {
+			tabbables.last().focus();
+			return false;
+		}
+	}
+
+});
+
+module.exports = FocusManager;
+
+},{}],43:[function(require,module,exports){
 /**
  * wp.media.view.Frame
  *
@@ -2681,437 +4919,184 @@ _.extend( Frame.prototype, wp.media.controller.StateMachine.prototype );
 
 module.exports = Frame;
 
-
-/***/ }),
-/* 47 */
-/***/ (function(module, exports) {
-
+},{}],44:[function(require,module,exports){
 /**
- * wp.media.view.MediaFrame
+ * wp.media.view.MediaFrame.ImageDetails
  *
- * The frame used to create the media modal.
+ * A media frame for manipulating an image that's already been inserted
+ * into a post.
  *
  * @class
+ * @augments wp.media.view.MediaFrame.Select
+ * @augments wp.media.view.MediaFrame
  * @augments wp.media.view.Frame
  * @augments wp.media.View
  * @augments wp.Backbone.View
  * @augments Backbone.View
  * @mixes wp.media.controller.StateMachine
  */
-var Frame = wp.media.view.Frame,
-	$ = jQuery,
-	MediaFrame;
-
-MediaFrame = Frame.extend({
-	className: 'media-frame',
-	template:  wp.template('media-frame'),
-	regions:   ['menu','title','content','toolbar','router'],
-
-	events: {
-		'click div.media-frame-title h1': 'toggleMenu'
-	},
-
-	/**
-	 * @global wp.Uploader
-	 */
-	initialize: function() {
-		Frame.prototype.initialize.apply( this, arguments );
-
-		_.defaults( this.options, {
-			title:    '',
-			modal:    true,
-			uploader: true
-		});
-
-		// Ensure core UI is enabled.
-		this.$el.addClass('wp-core-ui');
-
-		// Initialize modal container view.
-		if ( this.options.modal ) {
-			this.modal = new wp.media.view.Modal({
-				controller: this,
-				title:      this.options.title
-			});
-
-			this.modal.content( this );
-		}
-
-		// Force the uploader off if the upload limit has been exceeded or
-		// if the browser isn't supported.
-		if ( wp.Uploader.limitExceeded || ! wp.Uploader.browser.supported ) {
-			this.options.uploader = false;
-		}
-
-		// Initialize window-wide uploader.
-		if ( this.options.uploader ) {
-			this.uploader = new wp.media.view.UploaderWindow({
-				controller: this,
-				uploader: {
-					dropzone:  this.modal ? this.modal.$el : this.$el,
-					container: this.$el
-				}
-			});
-			this.views.set( '.media-frame-uploader', this.uploader );
-		}
-
-		this.on( 'attach', _.bind( this.views.ready, this.views ), this );
-
-		// Bind default title creation.
-		this.on( 'title:create:default', this.createTitle, this );
-		this.title.mode('default');
-
-		this.on( 'title:render', function( view ) {
-			view.$el.append( '<span class="dashicons dashicons-arrow-down"></span>' );
-		});
+var Select = wp.media.view.MediaFrame.Select,
+	l10n = wp.media.view.l10n,
+	ImageDetails;
 
-		// Bind default menu.
-		this.on( 'menu:create:default', this.createMenu, this );
-	},
-	/**
-	 * @returns {wp.media.view.MediaFrame} Returns itself to allow chaining
-	 */
-	render: function() {
-		// Activate the default state if no active state exists.
-		if ( ! this.state() && this.options.state ) {
-			this.setState( this.options.state );
-		}
-		/**
-		 * call 'render' directly on the parent class
-		 */
-		return Frame.prototype.render.apply( this, arguments );
-	},
-	/**
-	 * @param {Object} title
-	 * @this wp.media.controller.Region
-	 */
-	createTitle: function( title ) {
-		title.view = new wp.media.View({
-			controller: this,
-			tagName: 'h1'
-		});
-	},
-	/**
-	 * @param {Object} menu
-	 * @this wp.media.controller.Region
-	 */
-	createMenu: function( menu ) {
-		menu.view = new wp.media.view.Menu({
-			controller: this
-		});
+ImageDetails = Select.extend({
+	defaults: {
+		id:      'image',
+		url:     '',
+		menu:    'image-details',
+		content: 'image-details',
+		toolbar: 'image-details',
+		type:    'link',
+		title:    l10n.imageDetailsTitle,
+		priority: 120
 	},
 
-	toggleMenu: function() {
-		this.$el.find( '.media-menu' ).toggleClass( 'visible' );
+	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 );
 	},
 
-	/**
-	 * @param {Object} toolbar
-	 * @this wp.media.controller.Region
-	 */
-	createToolbar: function( toolbar ) {
-		toolbar.view = new wp.media.view.Toolbar({
-			controller: this
-		});
-	},
-	/**
-	 * @param {Object} router
-	 * @this wp.media.controller.Region
-	 */
-	createRouter: function( router ) {
-		router.view = new wp.media.view.Router({
-			controller: this
-		});
+	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 );
 	},
-	/**
-	 * @param {Object} options
-	 */
-	createIframeStates: function( options ) {
-		var settings = wp.media.view.settings,
-			tabs = settings.tabs,
-			tabUrl = settings.tabUrl,
-			$postId;
-
-		if ( ! tabs || ! tabUrl ) {
-			return;
-		}
-
-		// Add the post ID to the tab URL if it exists.
-		$postId = $('#post_ID');
-		if ( $postId.length ) {
-			tabUrl += '&post_id=' + $postId.val();
-		}
 
-		// Generate the tab states.
-		_.each( tabs, function( title, id ) {
-			this.state( 'iframe:' + id ).set( _.defaults({
-				tab:     id,
-				src:     tabUrl + '&tab=' + id,
-				title:   title,
-				content: 'iframe',
-				menu:    'default'
-			}, options ) );
-		}, this );
-
-		this.on( 'content:create:iframe', this.iframeContent, this );
-		this.on( 'content:deactivate:iframe', this.iframeContentCleanup, this );
-		this.on( 'menu:render:default', this.iframeMenu, this );
-		this.on( 'open', this.hijackThickbox, this );
-		this.on( 'close', this.restoreThickbox, this );
+	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
+			} )
+		]);
 	},
 
-	/**
-	 * @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
+	imageDetailsContent: function( options ) {
+		options.view = new wp.media.view.ImageDetails({
+			controller: this,
+			model: this.state().image,
+			attachment: this.state().image.attachment
 		});
 	},
 
-	iframeContentCleanup: function() {
-		this.$el.removeClass('hide-toolbar');
-	},
-
-	iframeMenu: function( view ) {
-		var views = {};
+	editImageContent: function() {
+		var state = this.state(),
+			model = state.get('image'),
+			view;
 
-		if ( ! view ) {
+		if ( ! model ) {
 			return;
 		}
 
-		_.each( wp.media.view.settings.tabs, function( title, id ) {
-			views[ 'iframe:' + id ] = {
-				text: this.state( 'iframe:' + id ).get('title'),
-				priority: 200
-			};
-		}, this );
-
-		view.set( views );
-	},
+		view = new wp.media.view.EditImage( { model: model, controller: this } ).render();
 
-	hijackThickbox: function() {
-		var frame = this;
+		this.content.set( view );
 
-		if ( ! window.tb_remove || this._tb_remove ) {
-			return;
-		}
+		// after bringing in the frame, load the actual editor via an ajax call
+		view.loadEditor();
 
-		this._tb_remove = window.tb_remove;
-		window.tb_remove = function() {
-			frame.close();
-			frame.reset();
-			frame.setState( frame.options.state );
-			frame._tb_remove.call( window );
-		};
 	},
 
-	restoreThickbox: function() {
-		if ( ! this._tb_remove ) {
-			return;
-		}
-
-		window.tb_remove = this._tb_remove;
-		delete this._tb_remove;
-	}
-});
-
-// Map some of the modal's methods to the frame.
-_.each(['open','close','attach','detach','escape'], function( method ) {
-	/**
-	 * @returns {wp.media.view.MediaFrame} Returns itself to allow chaining
-	 */
-	MediaFrame.prototype[ method ] = function() {
-		if ( this.modal ) {
-			this.modal[ method ].apply( this.modal, arguments );
-		}
-		return this;
-	};
-});
-
-module.exports = MediaFrame;
-
-
-/***/ }),
-/* 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
- */
+	renderImageDetailsToolbar: function() {
+		this.toolbar.set( new wp.media.view.Toolbar({
+			controller: this,
+			items: {
+				select: {
+					style:    'primary',
+					text:     l10n.update,
+					priority: 80,
 
-var MediaFrame = wp.media.view.MediaFrame,
-	l10n = wp.media.view.l10n,
-	Select;
+					click: function() {
+						var controller = this.controller,
+							state = controller.state();
 
-Select = MediaFrame.extend({
-	initialize: function() {
-		// Call 'initialize' directly on the parent class.
-		MediaFrame.prototype.initialize.apply( this, arguments );
+						controller.close();
 
-		_.defaults( this.options, {
-			selection: [],
-			library:   {},
-			multiple:  false,
-			state:    'library'
-		});
+						// 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() );
 
-		this.createSelection();
-		this.createStates();
-		this.bindHandlers();
+						// Restore and reset the default state.
+						controller.setState( controller.options.state );
+						controller.reset();
+					}
+				}
+			}
+		}) );
 	},
 
-	/**
-	 * 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;
+	renderReplaceImageToolbar: function() {
+		var frame = this,
+			lastState = frame.lastState(),
+			previous = lastState && lastState.id;
 
-		if ( ! (selection instanceof wp.media.model.Selection) ) {
-			this.options.selection = new wp.media.model.Selection( selection, {
-				multiple: this.options.multiple
-			});
-		}
+		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();
+						}
+					}
+				},
 
-		this._selection = {
-			attachments: new wp.media.model.Attachments(),
-			difference: []
-		};
-	},
+				replace: {
+					style:    'primary',
+					text:     l10n.replace,
+					priority: 80,
 
-	/**
-	 * Create the default states on the frame.
-	 */
-	createStates: function() {
-		var options = this.options;
+					click: function() {
+						var controller = this.controller,
+							state = controller.state(),
+							selection = state.get( 'selection' ),
+							attachment = selection.single();
 
-		if ( this.options.states ) {
-			return;
-		}
+						controller.close();
 
-		// 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
-			})
-		]);
-	},
+						controller.image.changeAttachment( attachment, state.display( attachment ) );
 
-	/**
-	 * 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 );
-	},
+						// 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() );
 
-	/**
-	 * 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
+						// Restore and reset the default state.
+						controller.setState( controller.options.state );
+						controller.reset();
+					}
+				}
 			}
-		});
-	},
-
-	/**
-	 * Render callback for the content region in the `browse` mode.
-	 *
-	 * @param {wp.media.controller.Region} contentRegion
-	 */
-	browseContent: function( contentRegion ) {
-		var state = this.state();
-
-		this.$el.removeClass('hide-toolbar');
-
-		// Browse our library of attachments.
-		contentRegion.view = new wp.media.view.AttachmentsBrowser({
-			controller: this,
-			collection: state.get('library'),
-			selection:  state.get('selection'),
-			model:      state,
-			sortable:   state.get('sortable'),
-			search:     state.get('searchable'),
-			filters:    state.get('filterable'),
-			date:       state.get('date'),
-			display:    state.has('display') ? state.get('display') : state.get('displaySettings'),
-			dragInfo:   state.get('dragInfo'),
-
-			idealColumnWidth: state.get('idealColumnWidth'),
-			suggestedWidth:   state.get('suggestedWidth'),
-			suggestedHeight:  state.get('suggestedHeight'),
-
-			AttachmentView: state.get('AttachmentView')
-		});
-	},
-
-	/**
-	 * Render callback for the content region in the `upload` mode.
-	 */
-	uploadContent: function() {
-		this.$el.removeClass( 'hide-toolbar' );
-		this.content.set( new wp.media.view.UploaderInline({
-			controller: this
 		}) );
-	},
-
-	/**
-	 * Toolbars
-	 *
-	 * @param {Object} toolbar
-	 * @param {Object} [options={}]
-	 * @this wp.media.controller.Region
-	 */
-	createSelectToolbar: function( toolbar, options ) {
-		options = options || this.options.button || {};
-		options.controller = this;
-
-		toolbar.view = new wp.media.view.Toolbar.Select( options );
 	}
-});
-
-module.exports = Select;
 
+});
 
-/***/ }),
-/* 49 */
-/***/ (function(module, exports) {
+module.exports = ImageDetails;
 
+},{}],45:[function(require,module,exports){
 /**
  * wp.media.view.MediaFrame.Post
  *
@@ -3846,19 +5831,13 @@ Post = Select.extend({
 
 module.exports = Post;
 
-
-/***/ }),
-/* 50 */
-/***/ (function(module, exports) {
-
+},{}],46:[function(require,module,exports){
 /**
- * wp.media.view.MediaFrame.ImageDetails
+ * wp.media.view.MediaFrame.Select
  *
- * A media frame for manipulating an image that's already been inserted
- * into a post.
+ * A frame for selecting an item or items from the media library.
  *
  * @class
- * @augments wp.media.view.MediaFrame.Select
  * @augments wp.media.view.MediaFrame
  * @augments wp.media.view.Frame
  * @augments wp.media.View
@@ -3866,1600 +5845,629 @@ module.exports = Post;
  * @augments Backbone.View
  * @mixes wp.media.controller.StateMachine
  */
-var Select = wp.media.view.MediaFrame.Select,
-	l10n = wp.media.view.l10n,
-	ImageDetails;
-
-ImageDetails = Select.extend({
-	defaults: {
-		id:      'image',
-		url:     '',
-		menu:    'image-details',
-		content: 'image-details',
-		toolbar: 'image-details',
-		type:    'link',
-		title:    l10n.imageDetailsTitle,
-		priority: 120
-	},
-
-	initialize: function( options ) {
-		this.image = new wp.media.model.PostImage( options.metadata );
-		this.options.selection = new wp.media.model.Selection( this.image.attachment, { multiple: false } );
-		Select.prototype.initialize.apply( this, arguments );
-	},
-
-	bindHandlers: function() {
-		Select.prototype.bindHandlers.apply( this, arguments );
-		this.on( 'menu:create:image-details', this.createMenu, this );
-		this.on( 'content:create:image-details', this.imageDetailsContent, this );
-		this.on( 'content:render:edit-image', this.editImageContent, this );
-		this.on( 'toolbar:render:image-details', this.renderImageDetailsToolbar, this );
-		// override the select toolbar
-		this.on( 'toolbar:render:replace', this.renderReplaceImageToolbar, this );
-	},
-
-	createStates: function() {
-		this.states.add([
-			new wp.media.controller.ImageDetails({
-				image: this.image,
-				editable: false
-			}),
-			new wp.media.controller.ReplaceImage({
-				id: 'replace-image',
-				library: wp.media.query( { type: 'image' } ),
-				image: this.image,
-				multiple:  false,
-				title:     l10n.imageReplaceTitle,
-				toolbar: 'replace',
-				priority:  80,
-				displaySettings: true
-			}),
-			new wp.media.controller.EditImage( {
-				image: this.image,
-				selection: this.options.selection
-			} )
-		]);
-	},
-
-	imageDetailsContent: function( options ) {
-		options.view = new wp.media.view.ImageDetails({
-			controller: this,
-			model: this.state().image,
-			attachment: this.state().image.attachment
-		});
-	},
-
-	editImageContent: function() {
-		var state = this.state(),
-			model = state.get('image'),
-			view;
-
-		if ( ! model ) {
-			return;
-		}
-
-		view = new wp.media.view.EditImage( { model: model, controller: this } ).render();
-
-		this.content.set( view );
-
-		// after bringing in the frame, load the actual editor via an ajax call
-		view.loadEditor();
-
-	},
-
-	renderImageDetailsToolbar: function() {
-		this.toolbar.set( new wp.media.view.Toolbar({
-			controller: this,
-			items: {
-				select: {
-					style:    'primary',
-					text:     l10n.update,
-					priority: 80,
-
-					click: function() {
-						var controller = this.controller,
-							state = controller.state();
-
-						controller.close();
-
-						// not sure if we want to use wp.media.string.image which will create a shortcode or
-						// perhaps wp.html.string to at least to build the <img />
-						state.trigger( 'update', controller.image.toJSON() );
-
-						// Restore and reset the default state.
-						controller.setState( controller.options.state );
-						controller.reset();
-					}
-				}
-			}
-		}) );
-	},
-
-	renderReplaceImageToolbar: function() {
-		var frame = this,
-			lastState = frame.lastState(),
-			previous = lastState && lastState.id;
-
-		this.toolbar.set( new wp.media.view.Toolbar({
-			controller: this,
-			items: {
-				back: {
-					text:     l10n.back,
-					priority: 20,
-					click:    function() {
-						if ( previous ) {
-							frame.setState( previous );
-						} else {
-							frame.close();
-						}
-					}
-				},
-
-				replace: {
-					style:    'primary',
-					text:     l10n.replace,
-					priority: 80,
-
-					click: function() {
-						var controller = this.controller,
-							state = controller.state(),
-							selection = state.get( 'selection' ),
-							attachment = selection.single();
-
-						controller.close();
-
-						controller.image.changeAttachment( attachment, state.display( attachment ) );
-
-						// not sure if we want to use wp.media.string.image which will create a shortcode or
-						// perhaps wp.html.string to at least to build the <img />
-						state.trigger( 'replace', controller.image.toJSON() );
-
-						// Restore and reset the default state.
-						controller.setState( controller.options.state );
-						controller.reset();
-					}
-				}
-			}
-		}) );
-	}
-
-});
-
-module.exports = ImageDetails;
-
-
-/***/ }),
-/* 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'
-	},
+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, {
-			container: document.body,
-			title:     '',
-			propagate: true,
-			freeze:    true
+			selection: [],
+			library:   {},
+			multiple:  false,
+			state:    'library'
 		});
 
-		this.focusManager = new wp.media.view.FocusManager({
-			el: this.el
-		});
+		this.createSelection();
+		this.createStates();
+		this.bindHandlers();
 	},
+
 	/**
-	 * @returns {Object}
+	 * 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
 	 */
-	prepare: function() {
-		return {
-			title: this.options.title
+	createSelection: function() {
+		var selection = this.options.selection;
+
+		if ( ! (selection instanceof wp.media.model.Selection) ) {
+			this.options.selection = new wp.media.model.Selection( selection, {
+				multiple: this.options.multiple
+			});
+		}
+
+		this._selection = {
+			attachments: new wp.media.model.Attachments(),
+			difference: []
 		};
 	},
 
 	/**
-	 * @returns {wp.media.view.Modal} Returns itself to allow chaining
+	 * Create the default states on the frame.
 	 */
-	attach: function() {
-		if ( this.views.attached ) {
-			return this;
-		}
+	createStates: function() {
+		var options = this.options;
 
-		if ( ! this.views.rendered ) {
-			this.render();
+		if ( this.options.states ) {
+			return;
 		}
 
-		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');
+		// 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
+			})
+		]);
 	},
 
 	/**
-	 * @returns {wp.media.view.Modal} Returns itself to allow chaining
+	 * Bind region mode event callbacks.
+	 *
+	 * @see media.controller.Region.render
 	 */
-	detach: function() {
-		if ( this.$el.is(':visible') ) {
-			this.close();
-		}
-
-		this.$el.detach();
-		this.views.attached = false;
-		return this.propagate('detach');
+	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 );
 	},
 
 	/**
-	 * @returns {wp.media.view.Modal} Returns itself to allow chaining
+	 * Render callback for the router region in the `browse` mode.
+	 *
+	 * @param {wp.media.view.Router} routerView
 	 */
-	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 );
+	browseRouter: function( routerView ) {
+		routerView.set({
+			upload: {
+				text:     l10n.uploadFilesTitle,
+				priority: 20
+			},
+			browse: {
+				text:     l10n.mediaLibraryTitle,
+				priority: 40
 			}
-		}
-
-		this.$el.focus();
-
-		return this.propagate('open');
+		});
 	},
 
 	/**
-	 * @param {Object} options
-	 * @returns {wp.media.view.Modal} Returns itself to allow chaining
+	 * Render callback for the content region in the `browse` mode.
+	 *
+	 * @param {wp.media.controller.Region} contentRegion
 	 */
-	close: function( options ) {
-		var freeze = this._freeze;
-
-		if ( ! this.views.attached || ! this.$el.is(':visible') ) {
-			return this;
-		}
-
-		// Enable page scrolling.
-		$( 'body' ).removeClass( 'modal-open' );
-
-		// Hide modal and remove restricted media modal tab focus once it's closed
-		this.$el.hide().undelegate( 'keydown' );
-
-		// Put focus back in useful location once modal is closed
-		$('#wpbody-content').focus();
+	browseContent: function( contentRegion ) {
+		var state = this.state();
 
-		this.propagate('close');
+		this.$el.removeClass('hide-toolbar');
 
-		// If the `freeze` option is set, restore the container's scroll position.
-		if ( freeze ) {
-			$( window ).scrollTop( freeze.scrollTop );
-		}
+		// 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'),
 
-		if ( options && options.escape ) {
-			this.propagate('escape');
-		}
+			idealColumnWidth: state.get('idealColumnWidth'),
+			suggestedWidth:   state.get('suggestedWidth'),
+			suggestedHeight:  state.get('suggestedHeight'),
 
-		return this;
-	},
-	/**
-	 * @returns {wp.media.view.Modal} Returns itself to allow chaining
-	 */
-	escape: function() {
-		return this.close({ escape: true });
-	},
-	/**
-	 * @param {Object} event
-	 */
-	escapeHandler: function( event ) {
-		event.preventDefault();
-		this.escape();
+			AttachmentView: state.get('AttachmentView')
+		});
 	},
 
 	/**
-	 * @param {Array|Object} content Views to register to '.media-modal-content'
-	 * @returns {wp.media.view.Modal} Returns itself to allow chaining
+	 * Render callback for the content region in the `upload` mode.
 	 */
-	content: function( content ) {
-		this.views.set( '.media-modal-content', content );
-		return this;
+	uploadContent: function() {
+		this.$el.removeClass( 'hide-toolbar' );
+		this.content.set( new wp.media.view.UploaderInline({
+			controller: this
+		}) );
 	},
 
 	/**
-	 * Triggers a modal event and if the `propagate` option is set,
-	 * forwards events to the modal's controller.
+	 * Toolbars
 	 *
-	 * @param {string} id
-	 * @returns {wp.media.view.Modal} Returns itself to allow chaining
+	 * @param {Object} toolbar
+	 * @param {Object} [options={}]
+	 * @this wp.media.controller.Region
 	 */
-	propagate: function( id ) {
-		this.trigger( id );
-
-		if ( this.options.propagate ) {
-			this.controller.trigger( id );
-		}
+	createSelectToolbar: function( toolbar, options ) {
+		options = options || this.options.button || {};
+		options.controller = this;
 
-		return this;
-	},
-	/**
-	 * @param {Object} event
-	 */
-	keydown: function( event ) {
-		// Close the modal when escape is pressed.
-		if ( 27 === event.which && this.$el.is(':visible') ) {
-			this.escape();
-			event.stopImmediatePropagation();
-		}
+		toolbar.view = new wp.media.view.Toolbar.Select( options );
 	}
 });
 
-module.exports = Modal;
-
-
-/***/ }),
-/* 52 */
-/***/ (function(module, exports) {
+module.exports = Select;
 
+},{}],47:[function(require,module,exports){
 /**
- * wp.media.view.FocusManager
+ * wp.media.view.Iframe
  *
  * @class
  * @augments wp.media.View
  * @augments wp.Backbone.View
  * @augments Backbone.View
  */
-var FocusManager = wp.media.View.extend({
-
-	events: {
-		'keydown': 'constrainTabbing'
-	},
-
-	focus: function() { // Reset focus on first left menu item
-		this.$('.media-menu-item').first().focus();
-	},
+var Iframe = wp.media.View.extend({
+	className: 'media-iframe',
 	/**
-	 * @param {Object} event
+	 * @returns {wp.media.view.Iframe} Returns itself to allow chaining
 	 */
-	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;
-		}
+	render: function() {
+		this.views.detach();
+		this.$el.html( '<iframe src="' + this.controller.state().get('src') + '" />' );
+		this.views.render();
+		return this;
 	}
-
 });
 
-module.exports = FocusManager;
-
-
-/***/ }),
-/* 53 */
-/***/ (function(module, exports) {
+module.exports = Iframe;
 
+},{}],48:[function(require,module,exports){
 /**
- * wp.media.view.UploaderWindow
- *
- * An uploader window that allows for dragging and dropping media.
+ * wp.media.view.ImageDetails
  *
  * @class
+ * @augments wp.media.view.Settings.AttachmentDisplay
+ * @augments wp.media.view.Settings
  * @augments wp.media.View
  * @augments wp.Backbone.View
  * @augments Backbone.View
- *
- * @param {object} [options]                   Options hash passed to the view.
- * @param {object} [options.uploader]          Uploader properties.
- * @param {jQuery} [options.uploader.browser]
- * @param {jQuery} [options.uploader.dropzone] jQuery collection of the dropzone.
- * @param {object} [options.uploader.params]
  */
-var $ = jQuery,
-	UploaderWindow;
-
-UploaderWindow = wp.media.View.extend({
-	tagName:   'div',
-	className: 'uploader-window',
-	template:  wp.template('uploader-window'),
+var AttachmentDisplay = wp.media.view.Settings.AttachmentDisplay,
+	$ = jQuery,
+	ImageDetails;
 
+ImageDetails = AttachmentDisplay.extend({
+	className: 'image-details',
+	template:  wp.template('image-details'),
+	events: _.defaults( AttachmentDisplay.prototype.events, {
+		'click .edit-attachment': 'editAttachment',
+		'click .replace-attachment': 'replaceAttachment',
+		'click .advanced-toggle': 'onToggleAdvanced',
+		'change [data-setting="customWidth"]': 'onCustomSize',
+		'change [data-setting="customHeight"]': 'onCustomSize',
+		'keyup [data-setting="customWidth"]': 'onCustomSize',
+		'keyup [data-setting="customHeight"]': 'onCustomSize'
+	} ),
 	initialize: function() {
-		var uploader;
-
-		this.$browser = $('<a href="#" class="browser" />').hide().appendTo('body');
-
-		uploader = this.options.uploader = _.defaults( this.options.uploader || {}, {
-			dropzone:  this.$el,
-			browser:   this.$browser,
-			params:    {}
-		});
-
-		// Ensure the dropzone is a jQuery collection.
-		if ( uploader.dropzone && ! (uploader.dropzone instanceof $) ) {
-			uploader.dropzone = $( uploader.dropzone );
-		}
-
-		this.controller.on( 'activate', this.refresh, this );
-
-		this.controller.on( 'detach', function() {
-			this.$browser.remove();
-		}, this );
-	},
+		// used in AttachmentDisplay.prototype.updateLinkTo
+		this.options.attachment = this.model.attachment;
+		this.listenTo( this.model, 'change:url', this.updateUrl );
+		this.listenTo( this.model, 'change:link', this.toggleLinkSettings );
+		this.listenTo( this.model, 'change:size', this.toggleCustomSize );
 
-	refresh: function() {
-		if ( this.uploader ) {
-			this.uploader.refresh();
-		}
+		AttachmentDisplay.prototype.initialize.apply( this, arguments );
 	},
 
-	ready: function() {
-		var postId = wp.media.view.settings.post.id,
-			dropzone;
-
-		// If the uploader already exists, bail.
-		if ( this.uploader ) {
-			return;
-		}
+	prepare: function() {
+		var attachment = false;
 
-		if ( postId ) {
-			this.options.uploader.params.post_id = postId;
+		if ( this.model.attachment ) {
+			attachment = this.model.attachment.toJSON();
 		}
-		this.uploader = new wp.Uploader( this.options.uploader );
-
-		dropzone = this.uploader.dropzone;
-		dropzone.on( 'dropzone:enter', _.bind( this.show, this ) );
-		dropzone.on( 'dropzone:leave', _.bind( this.hide, this ) );
-
-		$( this.uploader ).on( 'uploader:ready', _.bind( this._ready, this ) );
-	},
-
-	_ready: function() {
-		this.controller.trigger( 'uploader:ready' );
-	},
-
-	show: function() {
-		var $el = this.$el.show();
-
-		// Ensure that the animation is triggered by waiting until
-		// the transparent element is painted into the DOM.
-		_.defer( function() {
-			$el.css({ opacity: 1 });
-		});
+		return _.defaults({
+			model: this.model.toJSON(),
+			attachment: attachment
+		}, this.options );
 	},
 
-	hide: function() {
-		var $el = this.$el.css({ opacity: 0 });
-
-		wp.media.transition( $el ).done( function() {
-			// Transition end events are subject to race conditions.
-			// Make sure that the value is set as intended.
-			if ( '0' === $el.css('opacity') ) {
-				$el.hide();
-			}
-		});
-
-		// https://core.trac.wordpress.org/ticket/27341
-		_.delay( function() {
-			if ( '0' === $el.css('opacity') && $el.is(':visible') ) {
-				$el.hide();
-			}
-		}, 500 );
-	}
-});
-
-module.exports = UploaderWindow;
-
-
-/***/ }),
-/* 54 */
-/***/ (function(module, exports) {
-
-/**
- * Creates a dropzone on WP editor instances (elements with .wp-editor-wrap)
- * and relays drag'n'dropped files to a media workflow.
- *
- * wp.media.view.EditorUploader
- *
- * @class
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var View = wp.media.View,
-	l10n = wp.media.view.l10n,
-	$ = jQuery,
-	EditorUploader;
-
-EditorUploader = View.extend({
-	tagName:   'div',
-	className: 'uploader-editor',
-	template:  wp.template( 'uploader-editor' ),
-
-	localDrag: false,
-	overContainer: false,
-	overDropzone: false,
-	draggingFile: null,
-
-	/**
-	 * Bind drag'n'drop events to callbacks.
-	 */
-	initialize: function() {
-		this.initialized = false;
+	render: function() {
+		var args = arguments;
 
-		// Bail if not enabled or UA does not support drag'n'drop or File API.
-		if ( ! window.tinyMCEPreInit || ! window.tinyMCEPreInit.dragDropUpload || ! this.browserSupport() ) {
-			return this;
+		if ( this.model.attachment && 'pending' === this.model.dfd.state() ) {
+			this.model.dfd
+				.done( _.bind( function() {
+					AttachmentDisplay.prototype.render.apply( this, args );
+					this.postRender();
+				}, this ) )
+				.fail( _.bind( function() {
+					this.model.attachment = false;
+					AttachmentDisplay.prototype.render.apply( this, args );
+					this.postRender();
+				}, this ) );
+		} else {
+			AttachmentDisplay.prototype.render.apply( this, arguments );
+			this.postRender();
 		}
 
-		this.$document = $(document);
-		this.dropzones = [];
-		this.files = [];
-
-		this.$document.on( 'drop', '.uploader-editor', _.bind( this.drop, this ) );
-		this.$document.on( 'dragover', '.uploader-editor', _.bind( this.dropzoneDragover, this ) );
-		this.$document.on( 'dragleave', '.uploader-editor', _.bind( this.dropzoneDragleave, this ) );
-		this.$document.on( 'click', '.uploader-editor', _.bind( this.click, this ) );
-
-		this.$document.on( 'dragover', _.bind( this.containerDragover, this ) );
-		this.$document.on( 'dragleave', _.bind( this.containerDragleave, this ) );
-
-		this.$document.on( 'dragstart dragend drop', _.bind( function( event ) {
-			this.localDrag = event.type === 'dragstart';
-
-			if ( event.type === 'drop' ) {
-				this.containerDragleave();
-			}
-		}, this ) );
-
-		this.initialized = true;
 		return this;
 	},
 
-	/**
-	 * Check browser support for drag'n'drop.
-	 *
-	 * @return Boolean
-	 */
-	browserSupport: function() {
-		var supports = false, div = document.createElement('div');
-
-		supports = ( 'draggable' in div ) || ( 'ondragstart' in div && 'ondrop' in div );
-		supports = supports && !! ( window.File && window.FileList && window.FileReader );
-		return supports;
-	},
-
-	isDraggingFile: function( event ) {
-		if ( this.draggingFile !== null ) {
-			return this.draggingFile;
-		}
-
-		if ( _.isUndefined( event.originalEvent ) || _.isUndefined( event.originalEvent.dataTransfer ) ) {
-			return false;
+	postRender: function() {
+		setTimeout( _.bind( this.resetFocus, this ), 10 );
+		this.toggleLinkSettings();
+		if ( window.getUserSetting( 'advImgDetails' ) === 'show' ) {
+			this.toggleAdvanced( true );
 		}
-
-		this.draggingFile = _.indexOf( event.originalEvent.dataTransfer.types, 'Files' ) > -1 &&
-			_.indexOf( event.originalEvent.dataTransfer.types, 'text/plain' ) === -1;
-
-		return this.draggingFile;
+		this.trigger( 'post-render' );
 	},
 
-	refresh: function( e ) {
-		var dropzone_id;
-		for ( dropzone_id in this.dropzones ) {
-			// Hide the dropzones only if dragging has left the screen.
-			this.dropzones[ dropzone_id ].toggle( this.overContainer || this.overDropzone );
-		}
-
-		if ( ! _.isUndefined( e ) ) {
-			$( e.target ).closest( '.uploader-editor' ).toggleClass( 'droppable', this.overDropzone );
-		}
-
-		if ( ! this.overContainer && ! this.overDropzone ) {
-			this.draggingFile = null;
-		}
+	resetFocus: function() {
+		this.$( '.link-to-custom' ).blur();
+		this.$( '.embed-media-settings' ).scrollTop( 0 );
+	},
 
-		return this;
+	updateUrl: function() {
+		this.$( '.image img' ).attr( 'src', this.model.get( 'url' ) );
+		this.$( '.url' ).val( this.model.get( 'url' ) );
 	},
 
-	render: function() {
-		if ( ! this.initialized ) {
-			return this;
+	toggleLinkSettings: function() {
+		if ( this.model.get( 'link' ) === 'none' ) {
+			this.$( '.link-settings' ).addClass('hidden');
+		} else {
+			this.$( '.link-settings' ).removeClass('hidden');
 		}
-
-		View.prototype.render.apply( this, arguments );
-		$( '.wp-editor-wrap' ).each( _.bind( this.attach, this ) );
-		return this;
 	},
 
-	attach: function( index, editor ) {
-		// Attach a dropzone to an editor.
-		var dropzone = this.$el.clone();
-		this.dropzones.push( dropzone );
-		$( editor ).append( dropzone );
-		return this;
+	toggleCustomSize: function() {
+		if ( this.model.get( 'size' ) !== 'custom' ) {
+			this.$( '.custom-size' ).addClass('hidden');
+		} else {
+			this.$( '.custom-size' ).removeClass('hidden');
+		}
 	},
 
-	/**
-	 * When a file is dropped on the editor uploader, open up an editor media workflow
-	 * and upload the file immediately.
-	 *
-	 * @param  {jQuery.Event} event The 'drop' event.
-	 */
-	drop: function( event ) {
-		var $wrap, uploadView;
-
-		this.containerDragleave( event );
-		this.dropzoneDragleave( event );
+	onCustomSize: function( event ) {
+		var dimension = $( event.target ).data('setting'),
+			num = $( event.target ).val(),
+			value;
 
-		this.files = event.originalEvent.dataTransfer.files;
-		if ( this.files.length < 1 ) {
+		// Ignore bogus input
+		if ( ! /^\d+/.test( num ) || parseInt( num, 10 ) < 1 ) {
+			event.preventDefault();
 			return;
 		}
 
-		// Set the active editor to the drop target.
-		$wrap = $( event.target ).parents( '.wp-editor-wrap' );
-		if ( $wrap.length > 0 && $wrap[0].id ) {
-			window.wpActiveEditor = $wrap[0].id.slice( 3, -5 );
-		}
-
-		if ( ! this.workflow ) {
-			this.workflow = wp.media.editor.open( window.wpActiveEditor, {
-				frame:    'post',
-				state:    'insert',
-				title:    l10n.addMedia,
-				multiple: true
-			});
-
-			uploadView = this.workflow.uploader;
-
-			if ( uploadView.uploader && uploadView.uploader.ready ) {
-				this.addFiles.apply( this );
-			} else {
-				this.workflow.on( 'uploader:ready', this.addFiles, this );
-			}
+		if ( dimension === 'customWidth' ) {
+			value = Math.round( 1 / this.model.get( 'aspectRatio' ) * num );
+			this.model.set( 'customHeight', value, { silent: true } );
+			this.$( '[data-setting="customHeight"]' ).val( value );
 		} else {
-			this.workflow.state().reset();
-			this.addFiles.apply( this );
-			this.workflow.open();
+			value = Math.round( this.model.get( 'aspectRatio' ) * num );
+			this.model.set( 'customWidth', value, { silent: true  } );
+			this.$( '[data-setting="customWidth"]' ).val( value );
 		}
-
-		return false;
 	},
 
-	/**
-	 * Add the files to the uploader.
-	 */
-	addFiles: function() {
-		if ( this.files.length ) {
-			this.workflow.uploader.uploader.uploader.addFile( _.toArray( this.files ) );
-			this.files = [];
-		}
-		return this;
+	onToggleAdvanced: function( event ) {
+		event.preventDefault();
+		this.toggleAdvanced();
 	},
 
-	containerDragover: function( event ) {
-		if ( this.localDrag || ! this.isDraggingFile( event ) ) {
-			return;
+	toggleAdvanced: function( show ) {
+		var $advanced = this.$el.find( '.advanced-section' ),
+			mode;
+
+		if ( $advanced.hasClass('advanced-visible') || show === false ) {
+			$advanced.removeClass('advanced-visible');
+			$advanced.find('.advanced-settings').addClass('hidden');
+			mode = 'hide';
+		} else {
+			$advanced.addClass('advanced-visible');
+			$advanced.find('.advanced-settings').removeClass('hidden');
+			mode = 'show';
 		}
 
-		this.overContainer = true;
-		this.refresh();
+		window.setUserSetting( 'advImgDetails', mode );
 	},
 
-	containerDragleave: function() {
-		this.overContainer = false;
-
-		// Throttle dragleave because it's called when bouncing from some elements to others.
-		_.delay( _.bind( this.refresh, this ), 50 );
-	},
+	editAttachment: function( event ) {
+		var editState = this.controller.states.get( 'edit-image' );
 
-	dropzoneDragover: function( event ) {
-		if ( this.localDrag || ! this.isDraggingFile( event ) ) {
-			return;
+		if ( window.imageEdit && editState ) {
+			event.preventDefault();
+			editState.set( 'image', this.model.attachment );
+			this.controller.setState( 'edit-image' );
 		}
-
-		this.overDropzone = true;
-		this.refresh( event );
-		return false;
-	},
-
-	dropzoneDragleave: function( e ) {
-		this.overDropzone = false;
-		_.delay( _.bind( this.refresh, this, e ), 50 );
 	},
 
-	click: function( e ) {
-		// In the rare case where the dropzone gets stuck, hide it on click.
-		this.containerDragleave( e );
-		this.dropzoneDragleave( e );
-		this.localDrag = false;
+	replaceAttachment: function( event ) {
+		event.preventDefault();
+		this.controller.setState( 'replace-image' );
 	}
 });
 
-module.exports = EditorUploader;
-
-
-/***/ }),
-/* 55 */
-/***/ (function(module, exports) {
+module.exports = ImageDetails;
 
+},{}],49:[function(require,module,exports){
 /**
- * wp.media.view.UploaderInline
- *
- * The inline uploader that shows up in the 'Upload Files' tab.
+ * wp.media.view.Label
  *
  * @class
  * @augments wp.media.View
  * @augments wp.Backbone.View
  * @augments Backbone.View
  */
-var View = wp.media.View,
-	UploaderInline;
-
-UploaderInline = View.extend({
-	tagName:   'div',
-	className: 'uploader-inline',
-	template:  wp.template('uploader-inline'),
-
-	events: {
-		'click .close': 'hide'
-	},
+var Label = wp.media.View.extend({
+	tagName: 'label',
+	className: 'screen-reader-text',
 
 	initialize: function() {
-		_.defaults( this.options, {
-			message: '',
-			status:  true,
-			canClose: false
-		});
-
-		if ( ! this.options.$browser && this.controller.uploader ) {
-			this.options.$browser = this.controller.uploader.$browser;
-		}
-
-		if ( _.isUndefined( this.options.postId ) ) {
-			this.options.postId = wp.media.view.settings.post.id;
-		}
-
-		if ( this.options.status ) {
-			this.views.set( '.upload-inline-status', new wp.media.view.UploaderStatus({
-				controller: this.controller
-			}) );
-		}
-	},
-
-	prepare: function() {
-		var suggestedWidth = this.controller.state().get('suggestedWidth'),
-			suggestedHeight = this.controller.state().get('suggestedHeight'),
-			data = {};
-
-		data.message = this.options.message;
-		data.canClose = this.options.canClose;
-
-		if ( suggestedWidth && suggestedHeight ) {
-			data.suggestedWidth = suggestedWidth;
-			data.suggestedHeight = suggestedHeight;
-		}
-
-		return data;
-	},
-	/**
-	 * @returns {wp.media.view.UploaderInline} Returns itself to allow chaining
-	 */
-	dispose: function() {
-		if ( this.disposing ) {
-			/**
-			 * call 'dispose' directly on the parent class
-			 */
-			return View.prototype.dispose.apply( this, arguments );
-		}
-
-		// Run remove on `dispose`, so we can be sure to refresh the
-		// uploader with a view-less DOM. Track whether we're disposing
-		// so we don't trigger an infinite loop.
-		this.disposing = true;
-		return this.remove();
-	},
-	/**
-	 * @returns {wp.media.view.UploaderInline} Returns itself to allow chaining
-	 */
-	remove: function() {
-		/**
-		 * call 'remove' directly on the parent class
-		 */
-		var result = View.prototype.remove.apply( this, arguments );
-
-		_.defer( _.bind( this.refresh, this ) );
-		return result;
-	},
-
-	refresh: function() {
-		var uploader = this.controller.uploader;
-
-		if ( uploader ) {
-			uploader.refresh();
-		}
+		this.value = this.options.value;
 	},
-	/**
-	 * @returns {wp.media.view.UploaderInline}
-	 */
-	ready: function() {
-		var $browser = this.options.$browser,
-			$placeholder;
-
-		if ( this.controller.uploader ) {
-			$placeholder = this.$('.browser');
 
-			// Check if we've already replaced the placeholder.
-			if ( $placeholder[0] === $browser[0] ) {
-				return;
-			}
-
-			$browser.detach().text( $placeholder.text() );
-			$browser[0].className = $placeholder[0].className;
-			$placeholder.replaceWith( $browser.show() );
-		}
+	render: function() {
+		this.$el.html( this.value );
 
-		this.refresh();
 		return this;
-	},
-	show: function() {
-		this.$el.removeClass( 'hidden' );
-	},
-	hide: function() {
-		this.$el.addClass( 'hidden' );
 	}
-
 });
 
-module.exports = UploaderInline;
-
-
-/***/ }),
-/* 56 */
-/***/ (function(module, exports) {
+module.exports = Label;
 
+},{}],50:[function(require,module,exports){
 /**
- * wp.media.view.UploaderStatus
+ * wp.media.view.MediaFrame
  *
- * An uploader status for on-going uploads.
+ * The frame used to create the media modal.
  *
  * @class
+ * @augments wp.media.view.Frame
  * @augments wp.media.View
  * @augments wp.Backbone.View
  * @augments Backbone.View
+ * @mixes wp.media.controller.StateMachine
  */
-var View = wp.media.View,
-	UploaderStatus;
+var Frame = wp.media.view.Frame,
+	$ = jQuery,
+	MediaFrame;
 
-UploaderStatus = View.extend({
-	className: 'media-uploader-status',
-	template:  wp.template('uploader-status'),
+MediaFrame = Frame.extend({
+	className: 'media-frame',
+	template:  wp.template('media-frame'),
+	regions:   ['menu','title','content','toolbar','router'],
 
 	events: {
-		'click .upload-dismiss-errors': 'dismiss'
+		'click div.media-frame-title h1': 'toggleMenu'
 	},
 
-	initialize: function() {
-		this.queue = wp.Uploader.queue;
-		this.queue.on( 'add remove reset', this.visibility, this );
-		this.queue.on( 'add remove reset change:percent', this.progress, this );
-		this.queue.on( 'add remove reset change:uploading', this.info, this );
-
-		this.errors = wp.Uploader.errors;
-		this.errors.reset();
-		this.errors.on( 'add remove reset', this.visibility, this );
-		this.errors.on( 'add', this.error, this );
-	},
 	/**
 	 * @global wp.Uploader
-	 * @returns {wp.media.view.UploaderStatus}
 	 */
-	dispose: function() {
-		wp.Uploader.queue.off( null, null, this );
-		/**
-		 * call 'dispose' directly on the parent class
-		 */
-		View.prototype.dispose.apply( this, arguments );
-		return this;
-	},
-
-	visibility: function() {
-		this.$el.toggleClass( 'uploading', !! this.queue.length );
-		this.$el.toggleClass( 'errors', !! this.errors.length );
-		this.$el.toggle( !! this.queue.length || !! this.errors.length );
-	},
+	initialize: function() {
+		Frame.prototype.initialize.apply( this, arguments );
 
-	ready: function() {
-		_.each({
-			'$bar':      '.media-progress-bar div',
-			'$index':    '.upload-index',
-			'$total':    '.upload-total',
-			'$filename': '.upload-filename'
-		}, function( selector, key ) {
-			this[ key ] = this.$( selector );
-		}, this );
+		_.defaults( this.options, {
+			title:    '',
+			modal:    true,
+			uploader: true
+		});
 
-		this.visibility();
-		this.progress();
-		this.info();
-	},
+		// Ensure core UI is enabled.
+		this.$el.addClass('wp-core-ui');
 
-	progress: function() {
-		var queue = this.queue,
-			$bar = this.$bar;
+		// Initialize modal container view.
+		if ( this.options.modal ) {
+			this.modal = new wp.media.view.Modal({
+				controller: this,
+				title:      this.options.title
+			});
 
-		if ( ! $bar || ! queue.length ) {
-			return;
+			this.modal.content( this );
 		}
 
-		$bar.width( ( queue.reduce( function( memo, attachment ) {
-			if ( ! attachment.get('uploading') ) {
-				return memo + 100;
-			}
+		// 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;
+		}
 
-			var percent = attachment.get('percent');
-			return memo + ( _.isNumber( percent ) ? percent : 100 );
-		}, 0 ) / queue.length ) + '%' );
-	},
+		// 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 );
+		}
 
-	info: function() {
-		var queue = this.queue,
-			index = 0, active;
+		this.on( 'attach', _.bind( this.views.ready, this.views ), this );
 
-		if ( ! queue.length ) {
-			return;
-		}
+		// Bind default title creation.
+		this.on( 'title:create:default', this.createTitle, this );
+		this.title.mode('default');
 
-		active = this.queue.find( function( attachment, i ) {
-			index = i;
-			return attachment.get('uploading');
+		this.on( 'title:render', function( view ) {
+			view.$el.append( '<span class="dashicons dashicons-arrow-down"></span>' );
 		});
 
-		this.$index.text( index + 1 );
-		this.$total.text( queue.length );
-		this.$filename.html( active ? this.filename( active.get('filename') ) : '' );
-	},
-	/**
-	 * @param {string} filename
-	 * @returns {string}
-	 */
-	filename: function( filename ) {
-		return _.escape( filename );
+		// Bind default menu.
+		this.on( 'menu:create:default', this.createMenu, this );
 	},
 	/**
-	 * @param {Backbone.Model} error
+	 * @returns {wp.media.view.MediaFrame} Returns itself to allow chaining
 	 */
-	error: function( error ) {
-		this.views.add( '.upload-errors', new wp.media.view.UploaderStatusError({
-			filename: this.filename( error.get('file').name ),
-			message:  error.get('message')
-		}), { at: 0 });
+	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 );
 	},
-
 	/**
-	 * @global wp.Uploader
-	 *
-	 * @param {Object} event
+	 * @param {Object} title
+	 * @this wp.media.controller.Region
 	 */
-	dismiss: function( event ) {
-		var errors = this.views.get('.upload-errors');
-
-		event.preventDefault();
-
-		if ( errors ) {
-			_.invoke( errors, 'remove' );
-		}
-		wp.Uploader.errors.reset();
-	}
-});
-
-module.exports = UploaderStatus;
-
-
-/***/ }),
-/* 57 */
-/***/ (function(module, exports) {
-
-/**
- * wp.media.view.UploaderStatusError
- *
- * @class
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var UploaderStatusError = wp.media.View.extend({
-	className: 'upload-error',
-	template:  wp.template('uploader-status-error')
-});
-
-module.exports = UploaderStatusError;
-
-
-/***/ }),
-/* 58 */
-/***/ (function(module, exports) {
-
-/**
- * wp.media.view.Toolbar
- *
- * A toolbar which consists of a primary and a secondary section. Each sections
- * can be filled with views.
- *
- * @class
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var View = wp.media.View,
-	Toolbar;
-
-Toolbar = View.extend({
-	tagName:   'div',
-	className: 'media-toolbar',
-
-	initialize: function() {
-		var state = this.controller.state(),
-			selection = this.selection = state.get('selection'),
-			library = this.library = state.get('library');
-
-		this._views = {};
-
-		// The toolbar is composed of two `PriorityList` views.
-		this.primary   = new wp.media.view.PriorityList();
-		this.secondary = new wp.media.view.PriorityList();
-		this.primary.$el.addClass('media-toolbar-primary search-form');
-		this.secondary.$el.addClass('media-toolbar-secondary');
-
-		this.views.set([ this.secondary, this.primary ]);
-
-		if ( this.options.items ) {
-			this.set( this.options.items, { silent: true });
-		}
-
-		if ( ! this.options.silent ) {
-			this.render();
-		}
-
-		if ( selection ) {
-			selection.on( 'add remove reset', this.refresh, this );
-		}
-
-		if ( library ) {
-			library.on( 'add remove reset', this.refresh, this );
-		}
+	createTitle: function( title ) {
+		title.view = new wp.media.View({
+			controller: this,
+			tagName: 'h1'
+		});
 	},
 	/**
-	 * @returns {wp.media.view.Toolbar} Returns itsef to allow chaining
+	 * @param {Object} menu
+	 * @this wp.media.controller.Region
 	 */
-	dispose: function() {
-		if ( this.selection ) {
-			this.selection.off( null, null, this );
-		}
-
-		if ( this.library ) {
-			this.library.off( null, null, this );
-		}
-		/**
-		 * call 'dispose' directly on the parent class
-		 */
-		return View.prototype.dispose.apply( this, arguments );
+	createMenu: function( menu ) {
+		menu.view = new wp.media.view.Menu({
+			controller: this
+		});
 	},
 
-	ready: function() {
-		this.refresh();
+	toggleMenu: function() {
+		this.$el.find( '.media-menu' ).toggleClass( 'visible' );
 	},
 
 	/**
-	 * @param {string} id
-	 * @param {Backbone.View|Object} view
-	 * @param {Object} [options={}]
-	 * @returns {wp.media.view.Toolbar} Returns itself to allow chaining
+	 * @param {Object} toolbar
+	 * @this wp.media.controller.Region
 	 */
-	set: function( id, view, options ) {
-		var list;
-		options = options || {};
-
-		// Accept an object with an `id` : `view` mapping.
-		if ( _.isObject( id ) ) {
-			_.each( id, function( view, id ) {
-				this.set( id, view, { silent: true });
-			}, this );
-
-		} else {
-			if ( ! ( view instanceof Backbone.View ) ) {
-				view.classes = [ 'media-button-' + id ].concat( view.classes || [] );
-				view = new wp.media.view.Button( view ).render();
-			}
-
-			view.controller = view.controller || this.controller;
-
-			this._views[ id ] = view;
-
-			list = view.options.priority < 0 ? 'secondary' : 'primary';
-			this[ list ].set( id, view, options );
-		}
-
-		if ( ! options.silent ) {
-			this.refresh();
-		}
-
-		return this;
+	createToolbar: function( toolbar ) {
+		toolbar.view = new wp.media.view.Toolbar({
+			controller: this
+		});
 	},
 	/**
-	 * @param {string} id
-	 * @returns {wp.media.view.Button}
+	 * @param {Object} router
+	 * @this wp.media.controller.Region
 	 */
-	get: function( id ) {
-		return this._views[ id ];
+	createRouter: function( router ) {
+		router.view = new wp.media.view.Router({
+			controller: this
+		});
 	},
 	/**
-	 * @param {string} id
 	 * @param {Object} options
-	 * @returns {wp.media.view.Toolbar} Returns itself to allow chaining
 	 */
-	unset: function( id, options ) {
-		delete this._views[ id ];
-		this.primary.unset( id, options );
-		this.secondary.unset( id, options );
-
-		if ( ! options || ! options.silent ) {
-			this.refresh();
-		}
-		return this;
-	},
-
-	refresh: function() {
-		var state = this.controller.state(),
-			library = state.get('library'),
-			selection = state.get('selection');
-
-		_.each( this._views, function( button ) {
-			if ( ! button.model || ! button.options || ! button.options.requires ) {
-				return;
-			}
-
-			var requires = button.options.requires,
-				disabled = false;
-
-			// Prevent insertion of attachments if any of them are still uploading
-			disabled = _.some( selection.models, function( attachment ) {
-				return attachment.get('uploading') === true;
-			});
-
-			if ( requires.selection && selection && ! selection.length ) {
-				disabled = true;
-			} else if ( requires.library && library && ! library.length ) {
-				disabled = true;
-			}
-			button.model.set( 'disabled', disabled );
-		});
-	}
-});
-
-module.exports = Toolbar;
-
-
-/***/ }),
-/* 59 */
-/***/ (function(module, exports) {
-
-/**
- * wp.media.view.Toolbar.Select
- *
- * @class
- * @augments wp.media.view.Toolbar
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var Toolbar = wp.media.view.Toolbar,
-	l10n = wp.media.view.l10n,
-	Select;
-
-Select = Toolbar.extend({
-	initialize: function() {
-		var options = this.options;
-
-		_.bindAll( this, 'clickSelect' );
-
-		_.defaults( options, {
-			event: 'select',
-			state: false,
-			reset: true,
-			close: true,
-			text:  l10n.select,
-
-			// Does the button rely on the selection?
-			requires: {
-				selection: true
-			}
-		});
-
-		options.items = _.defaults( options.items || {}, {
-			select: {
-				style:    'primary',
-				text:     options.text,
-				priority: 80,
-				click:    this.clickSelect,
-				requires: options.requires
-			}
-		});
-		// Call 'initialize' directly on the parent class.
-		Toolbar.prototype.initialize.apply( this, arguments );
-	},
-
-	clickSelect: function() {
-		var options = this.options,
-			controller = this.controller;
-
-		if ( options.close ) {
-			controller.close();
-		}
-
-		if ( options.event ) {
-			controller.state().trigger( options.event );
-		}
+	createIframeStates: function( options ) {
+		var settings = wp.media.view.settings,
+			tabs = settings.tabs,
+			tabUrl = settings.tabUrl,
+			$postId;
 
-		if ( options.state ) {
-			controller.setState( options.state );
+		if ( ! tabs || ! tabUrl ) {
+			return;
 		}
 
-		if ( options.reset ) {
-			controller.reset();
+		// Add the post ID to the tab URL if it exists.
+		$postId = $('#post_ID');
+		if ( $postId.length ) {
+			tabUrl += '&post_id=' + $postId.val();
 		}
-	}
-});
-
-module.exports = Select;
-
-
-/***/ }),
-/* 60 */
-/***/ (function(module, exports) {
 
-/**
- * wp.media.view.Toolbar.Embed
- *
- * @class
- * @augments wp.media.view.Toolbar.Select
- * @augments wp.media.view.Toolbar
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var Select = wp.media.view.Toolbar.Select,
-	l10n = wp.media.view.l10n,
-	Embed;
+		// 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 );
 
-Embed = Select.extend({
-	initialize: function() {
-		_.defaults( this.options, {
-			text: l10n.insertIntoPost,
-			requires: false
-		});
-		// Call 'initialize' directly on the parent class.
-		Select.prototype.initialize.apply( this, arguments );
+		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 );
 	},
 
-	refresh: function() {
-		var url = this.controller.state().props.get('url');
-		this.get('select').model.set( 'disabled', ! url || url === 'http://' );
-		/**
-		 * call 'refresh' directly on the parent class
-		 */
-		Select.prototype.refresh.apply( this, arguments );
-	}
-});
-
-module.exports = Embed;
-
-
-/***/ }),
-/* 61 */
-/***/ (function(module, exports) {
-
-/**
- * wp.media.view.Button
- *
- * @class
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var Button = wp.media.View.extend({
-	tagName:    'button',
-	className:  'media-button',
-	attributes: { type: 'button' },
-
-	events: {
-		'click': 'click'
+	/**
+	 * @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
+		});
 	},
 
-	defaults: {
-		text:     '',
-		style:    '',
-		size:     'large',
-		disabled: false
+	iframeContentCleanup: function() {
+		this.$el.removeClass('hide-toolbar');
 	},
 
-	initialize: function() {
-		/**
-		 * Create a model with the provided `defaults`.
-		 *
-		 * @member {Backbone.Model}
-		 */
-		this.model = new Backbone.Model( this.defaults );
+	iframeMenu: function( view ) {
+		var views = {};
 
-		// 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;
-			}
+		if ( ! view ) {
+			return;
+		}
 
-			this.model.set( key, value );
-			delete this.options[ key ];
+		_.each( wp.media.view.settings.tabs, function( title, id ) {
+			views[ 'iframe:' + id ] = {
+				text: this.state( 'iframe:' + id ).get('title'),
+				priority: 200
+			};
 		}, this );
 
-		this.listenTo( this.model, 'change', this.render );
+		view.set( views );
 	},
-	/**
-	 * @returns {wp.media.view.Button} Returns itself to allow chaining
-	 */
-	render: function() {
-		var classes = [ 'button', this.className ],
-			model = this.model.toJSON();
 
-		if ( model.style ) {
-			classes.push( 'button-' + model.style );
-		}
+	hijackThickbox: function() {
+		var frame = this;
 
-		if ( model.size ) {
-			classes.push( 'button-' + model.size );
+		if ( ! window.tb_remove || this._tb_remove ) {
+			return;
 		}
 
-		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;
+		this._tb_remove = window.tb_remove;
+		window.tb_remove = function() {
+			frame.close();
+			frame.reset();
+			frame.setState( frame.options.state );
+			frame._tb_remove.call( window );
+		};
 	},
-	/**
-	 * @param {Object} event
-	 */
-	click: function( event ) {
-		if ( '#' === this.attributes.href ) {
-			event.preventDefault();
-		}
 
-		if ( this.options.click && ! this.model.get('disabled') ) {
-			this.options.click.apply( this, arguments );
-		}
-	}
-});
-
-module.exports = Button;
-
-
-/***/ }),
-/* 62 */
-/***/ (function(module, exports) {
-
-/**
- * wp.media.view.ButtonGroup
- *
- * @class
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var $ = Backbone.$,
-	ButtonGroup;
-
-ButtonGroup = wp.media.View.extend({
-	tagName:   'div',
-	className: 'button-group button-large media-button-group',
-
-	initialize: function() {
-		/**
-		 * @member {wp.media.view.Button[]}
-		 */
-		this.buttons = _.map( this.options.buttons || [], function( button ) {
-			if ( button instanceof Backbone.View ) {
-				return button;
-			} else {
-				return new wp.media.view.Button( button ).render();
-			}
-		});
-
-		delete this.options.buttons;
-
-		if ( this.options.classes ) {
-			this.$el.addClass( this.options.classes );
+	restoreThickbox: function() {
+		if ( ! this._tb_remove ) {
+			return;
 		}
-	},
 
-	/**
-	 * @returns {wp.media.view.ButtonGroup}
-	 */
-	render: function() {
-		this.$el.html( $( _.pluck( this.buttons, 'el' ) ).detach() );
-		return this;
+		window.tb_remove = this._tb_remove;
+		delete this._tb_remove;
 	}
 });
 
-module.exports = ButtonGroup;
-
-
-/***/ }),
-/* 63 */
-/***/ (function(module, exports) {
-
-/**
- * wp.media.view.PriorityList
- *
- * @class
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var PriorityList = wp.media.View.extend({
-	tagName:   'div',
-
-	initialize: function() {
-		this._views = {};
-
-		this.set( _.extend( {}, this._views, this.options.views ), { silent: true });
-		delete this.options.views;
-
-		if ( ! this.options.silent ) {
-			this.render();
-		}
-	},
+// Map some of the modal's methods to the frame.
+_.each(['open','close','attach','detach','escape'], function( method ) {
 	/**
-	 * @param {string} id
-	 * @param {wp.media.View|Object} view
-	 * @param {Object} options
-	 * @returns {wp.media.view.PriorityList} Returns itself to allow chaining
+	 * @returns {wp.media.view.MediaFrame} Returns itself to allow chaining
 	 */
-	set: function( id, view, options ) {
-		var priority, views, index;
-
-		options = options || {};
-
-		// Accept an object with an `id` : `view` mapping.
-		if ( _.isObject( id ) ) {
-			_.each( id, function( view, id ) {
-				this.set( id, view );
-			}, this );
-			return this;
-		}
-
-		if ( ! (view instanceof Backbone.View) ) {
-			view = this.toView( view, id, options );
+	MediaFrame.prototype[ method ] = function() {
+		if ( this.modal ) {
+			this.modal[ method ].apply( this.modal, arguments );
 		}
-		view.controller = view.controller || this.controller;
-
-		this.unset( id );
-
-		priority = view.options.priority || 10;
-		views = this.views.get() || [];
-
-		_.find( views, function( existing, i ) {
-			if ( existing.options.priority > priority ) {
-				index = i;
-				return true;
-			}
-		});
-
-		this._views[ id ] = view;
-		this.views.add( view, {
-			at: _.isNumber( index ) ? index : views.length || 0
-		});
-
 		return this;
-	},
-	/**
-	 * @param {string} id
-	 * @returns {wp.media.View}
-	 */
-	get: function( id ) {
-		return this._views[ id ];
-	},
-	/**
-	 * @param {string} id
-	 * @returns {wp.media.view.PriorityList}
-	 */
-	unset: function( id ) {
-		var view = this.get( id );
-
-		if ( view ) {
-			view.remove();
-		}
-
-		delete this._views[ id ];
-		return this;
-	},
-	/**
-	 * @param {Object} options
-	 * @returns {wp.media.View}
-	 */
-	toView: function( options ) {
-		return new wp.media.View( options );
-	}
+	};
 });
 
-module.exports = PriorityList;
-
-
-/***/ }),
-/* 64 */
-/***/ (function(module, exports) {
+module.exports = MediaFrame;
 
+},{}],51:[function(require,module,exports){
 /**
  * wp.media.view.MenuItem
  *
@@ -5531,11 +6539,7 @@ MenuItem = wp.media.View.extend({
 
 module.exports = MenuItem;
 
-
-/***/ }),
-/* 65 */
-/***/ (function(module, exports) {
-
+},{}],52:[function(require,module,exports){
 /**
  * wp.media.view.Menu
  *
@@ -5652,997 +6656,378 @@ Menu = PriorityList.extend({
 
 module.exports = Menu;
 
-
-/***/ }),
-/* 66 */
-/***/ (function(module, exports) {
-
-/**
- * wp.media.view.RouterItem
- *
- * @class
- * @augments wp.media.view.MenuItem
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var RouterItem = wp.media.view.MenuItem.extend({
-	/**
-	 * On click handler to activate the content region's corresponding mode.
-	 */
-	click: function() {
-		var contentMode = this.options.contentMode;
-		if ( contentMode ) {
-			this.controller.content.mode( contentMode );
-		}
-	}
-});
-
-module.exports = RouterItem;
-
-
-/***/ }),
-/* 67 */
-/***/ (function(module, exports) {
-
-/**
- * wp.media.view.Router
- *
- * @class
- * @augments wp.media.view.Menu
- * @augments wp.media.view.PriorityList
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var Menu = wp.media.view.Menu,
-	Router;
-
-Router = Menu.extend({
-	tagName:   'div',
-	className: 'media-router',
-	property:  'contentMode',
-	ItemView:  wp.media.view.RouterItem,
-	region:    'router',
-
-	initialize: function() {
-		this.controller.on( 'content:render', this.update, this );
-		// Call 'initialize' directly on the parent class.
-		Menu.prototype.initialize.apply( this, arguments );
-	},
-
-	update: function() {
-		var mode = this.controller.content.mode();
-		if ( mode ) {
-			this.select( mode );
-		}
-	}
-});
-
-module.exports = Router;
-
-
-/***/ }),
-/* 68 */
-/***/ (function(module, exports) {
-
+},{}],53:[function(require,module,exports){
 /**
- * wp.media.view.Sidebar
+ * wp.media.view.Modal
  *
- * @class
- * @augments wp.media.view.PriorityList
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var Sidebar = wp.media.view.PriorityList.extend({
-	className: 'media-sidebar'
-});
-
-module.exports = Sidebar;
-
-
-/***/ }),
-/* 69 */
-/***/ (function(module, exports) {
-
-/**
- * wp.media.view.Attachment
+ * 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 View = wp.media.View,
-	$ = jQuery,
-	Attachment;
+var $ = jQuery,
+	Modal;
 
-Attachment = View.extend({
-	tagName:   'li',
-	className: 'attachment',
-	template:  wp.template('attachment'),
+Modal = wp.media.View.extend({
+	tagName:  'div',
+	template: wp.template('media-modal'),
 
-	attributes: function() {
-		return {
-			'tabIndex':     0,
-			'role':         'checkbox',
-			'aria-label':   this.model.get( 'title' ),
-			'aria-checked': false,
-			'data-id':      this.model.get( 'id' )
-		};
+	attributes: {
+		tabindex: 0
 	},
 
 	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'
+		'click .media-modal-backdrop, .media-modal-close': 'escapeHandler',
+		'keydown': 'keydown'
 	},
 
-	buttons: {},
-
 	initialize: function() {
-		var selection = this.options.selection,
-			options = _.defaults( this.options, {
-				rerenderOnModelChange: true
-			} );
-
-		if ( options.rerenderOnModelChange ) {
-			this.listenTo( this.model, 'change', this.render );
-		} else {
-			this.listenTo( this.model, 'change:percent', this.progress );
-		}
-		this.listenTo( this.model, 'change:title', this._syncTitle );
-		this.listenTo( this.model, 'change:caption', this._syncCaption );
-		this.listenTo( this.model, 'change:artist', this._syncArtist );
-		this.listenTo( this.model, 'change:album', this._syncAlbum );
-
-		// Update the selection.
-		this.listenTo( this.model, 'add', this.select );
-		this.listenTo( this.model, 'remove', this.deselect );
-		if ( selection ) {
-			selection.on( 'reset', this.updateSelect, this );
-			// Update the model's details view.
-			this.listenTo( this.model, 'selection:single selection:unsingle', this.details );
-			this.details( this.model, this.controller.state().get('selection') );
-		}
+		_.defaults( this.options, {
+			container: document.body,
+			title:     '',
+			propagate: true,
+			freeze:    true
+		});
 
-		this.listenTo( this.controller, 'attachment:compat:waiting attachment:compat:ready', this.updateSave );
+		this.focusManager = new wp.media.view.FocusManager({
+			el: this.el
+		});
 	},
 	/**
-	 * @returns {wp.media.view.Attachment} Returns itself to allow chaining
+	 * @returns {Object}
 	 */
-	dispose: function() {
-		var selection = this.options.selection;
-
-		// Make sure all settings are saved before removing the view.
-		this.updateAll();
-
-		if ( selection ) {
-			selection.off( null, null, this );
-		}
-		/**
-		 * call 'dispose' directly on the parent class
-		 */
-		View.prototype.dispose.apply( this, arguments );
-		return this;
+	prepare: function() {
+		return {
+			title: this.options.title
+		};
 	},
+
 	/**
-	 * @returns {wp.media.view.Attachment} Returns itself to allow chaining
+	 * @returns {wp.media.view.Modal} Returns itself to allow chaining
 	 */
-	render: function() {
-		var options = _.defaults( this.model.toJSON(), {
-				orientation:   'landscape',
-				uploading:     false,
-				type:          '',
-				subtype:       '',
-				icon:          '',
-				filename:      '',
-				caption:       '',
-				title:         '',
-				dateFormatted: '',
-				width:         '',
-				height:        '',
-				compat:        false,
-				alt:           '',
-				description:   ''
-			}, this.options );
-
-		options.buttons  = this.buttons;
-		options.describe = this.controller.state().get('describe');
-
-		if ( 'image' === options.type ) {
-			options.size = this.imageSize();
-		}
-
-		options.can = {};
-		if ( options.nonces ) {
-			options.can.remove = !! options.nonces['delete'];
-			options.can.save = !! options.nonces.update;
-		}
-
-		if ( this.controller.state().get('allowLocalEdits') ) {
-			options.allowLocalEdits = true;
-		}
-
-		if ( options.uploading && ! options.percent ) {
-			options.percent = 0;
+	attach: function() {
+		if ( this.views.attached ) {
+			return this;
 		}
 
-		this.views.detach();
-		this.$el.html( this.template( options ) );
-
-		this.$el.toggleClass( 'uploading', options.uploading );
-
-		if ( options.uploading ) {
-			this.$bar = this.$('.media-progress-bar div');
-		} else {
-			delete this.$bar;
+		if ( ! this.views.rendered ) {
+			this.render();
 		}
 
-		// Check if the model is selected.
-		this.updateSelect();
-
-		// Update the save status.
-		this.updateSave();
+		this.$el.appendTo( this.options.container );
 
-		this.views.render();
+		// Manually mark the view as attached and trigger ready.
+		this.views.attached = true;
+		this.views.ready();
 
-		return this;
+		return this.propagate('attach');
 	},
 
-	progress: function() {
-		if ( this.$bar && this.$bar.length ) {
-			this.$bar.width( this.model.get('percent') + '%' );
+	/**
+	 * @returns {wp.media.view.Modal} Returns itself to allow chaining
+	 */
+	detach: function() {
+		if ( this.$el.is(':visible') ) {
+			this.close();
 		}
+
+		this.$el.detach();
+		this.views.attached = false;
+		return this.propagate('detach');
 	},
 
 	/**
-	 * @param {Object} event
+	 * @returns {wp.media.view.Modal} Returns itself to allow chaining
 	 */
-	toggleSelectionHandler: function( event ) {
-		var method;
+	open: function() {
+		var $el = this.$el,
+			options = this.options,
+			mceEditor;
 
-		// Don't do anything inside inputs and on the attachment check and remove buttons.
-		if ( 'INPUT' === event.target.nodeName || 'BUTTON' === event.target.nodeName ) {
-			return;
+		if ( $el.is(':visible') ) {
+			return this;
 		}
 
-		// Catch arrow events
-		if ( 37 === event.keyCode || 38 === event.keyCode || 39 === event.keyCode || 40 === event.keyCode ) {
-			this.controller.trigger( 'attachment:keydown:arrow', event );
-			return;
+		if ( ! this.views.attached ) {
+			this.attach();
 		}
 
-		// Catch enter and space events
-		if ( 'keydown' === event.type && 13 !== event.keyCode && 32 !== event.keyCode ) {
-			return;
+		// If the `freeze` option is set, record the window's scroll position.
+		if ( options.freeze ) {
+			this._freeze = {
+				scrollTop: $( window ).scrollTop()
+			};
 		}
 
-		event.preventDefault();
+		// Disable page scrolling.
+		$( 'body' ).addClass( 'modal-open' );
 
-		// 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;
-			}
+		$el.show();
 
-			if ( this.controller.isModeActive( 'select' ) ) {
-				method = 'toggle';
-			}
-		}
+		// 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();
 
-		if ( event.shiftKey ) {
-			method = 'between';
-		} else if ( event.ctrlKey || event.metaKey ) {
-			method = 'toggle';
+				setTimeout( function() {
+					mceEditor.iframeElement.blur();
+				}, 100 );
+			}
 		}
 
-		this.toggleSelection({
-			method: method
-		});
+		this.$el.focus();
 
-		this.controller.trigger( 'selection:toggle' );
+		return this.propagate('open');
 	},
+
 	/**
 	 * @param {Object} options
+	 * @returns {wp.media.view.Modal} Returns itself to allow chaining
 	 */
-	toggleSelection: function( options ) {
-		var collection = this.collection,
-			selection = this.options.selection,
-			model = this.model,
-			method = options && options.method,
-			single, models, singleIndex, modelIndex;
+	close: function( options ) {
+		var freeze = this._freeze;
 
-		if ( ! selection ) {
-			return;
+		if ( ! this.views.attached || ! this.$el.is(':visible') ) {
+			return this;
 		}
 
-		single = selection.single();
-		method = _.isUndefined( method ) ? selection.multiple : method;
-
-		// If the `method` is set to `between`, select all models that
-		// exist between the current and the selected model.
-		if ( 'between' === method && single && selection.multiple ) {
-			// If the models are the same, short-circuit.
-			if ( single === model ) {
-				return;
-			}
-
-			singleIndex = collection.indexOf( single );
-			modelIndex  = collection.indexOf( this.model );
-
-			if ( singleIndex < modelIndex ) {
-				models = collection.models.slice( singleIndex, modelIndex + 1 );
-			} else {
-				models = collection.models.slice( modelIndex, singleIndex + 1 );
-			}
+		// Enable page scrolling.
+		$( 'body' ).removeClass( 'modal-open' );
 
-			selection.add( models );
-			selection.single( model );
-			return;
+		// Hide modal and remove restricted media modal tab focus once it's closed
+		this.$el.hide().undelegate( 'keydown' );
 
-		// 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;
-		}
+		// Put focus back in useful location once modal is closed
+		$('#wpbody-content').focus();
 
-		// Fixes bug that loses focus when selecting a featured image
-		if ( ! method ) {
-			method = 'add';
-		}
+		this.propagate('close');
 
-		if ( method !== 'add' ) {
-			method = 'reset';
+		// If the `freeze` option is set, restore the container's scroll position.
+		if ( freeze ) {
+			$( window ).scrollTop( freeze.scrollTop );
 		}
 
-		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 );
+		if ( options && options.escape ) {
+			this.propagate('escape');
 		}
-	},
 
-	updateSelect: function() {
-		this[ this.selected() ? 'select' : 'deselect' ]();
+		return this;
 	},
 	/**
-	 * @returns {unresolved|Boolean}
+	 * @returns {wp.media.view.Modal} Returns itself to allow chaining
 	 */
-	selected: function() {
-		var selection = this.options.selection;
-		if ( selection ) {
-			return !! selection.get( this.model.cid );
-		}
+	escape: function() {
+		return this.close({ escape: true });
 	},
 	/**
-	 * @param {Backbone.Model} model
-	 * @param {Backbone.Collection} collection
+	 * @param {Object} event
 	 */
-	select: function( model, collection ) {
-		var selection = this.options.selection,
-			controller = this.controller;
-
-		// Check if a selection exists and if it's the collection provided.
-		// If they're not the same collection, bail; we're in another
-		// selection's event loop.
-		if ( ! selection || ( collection && collection !== selection ) ) {
-			return;
-		}
-
-		// Bail if the model is already selected.
-		if ( this.$el.hasClass( 'selected' ) ) {
-			return;
-		}
-
-		// Add 'selected' class to model, set aria-checked to true.
-		this.$el.addClass( 'selected' ).attr( 'aria-checked', true );
-		//  Make the checkbox tabable, except in media grid (bulk select mode).
-		if ( ! ( controller.isModeActive( 'grid' ) && controller.isModeActive( 'select' ) ) ) {
-			this.$( '.check' ).attr( 'tabindex', '0' );
-		}
+	escapeHandler: function( event ) {
+		event.preventDefault();
+		this.escape();
 	},
-	/**
-	 * @param {Backbone.Model} model
-	 * @param {Backbone.Collection} collection
-	 */
-	deselect: function( model, collection ) {
-		var selection = this.options.selection;
 
-		// Check if a selection exists and if it's the collection provided.
-		// If they're not the same collection, bail; we're in another
-		// selection's event loop.
-		if ( ! selection || ( collection && collection !== selection ) ) {
-			return;
-		}
-		this.$el.removeClass( 'selected' ).attr( 'aria-checked', false )
-			.find( '.check' ).attr( 'tabindex', '-1' );
-	},
 	/**
-	 * @param {Backbone.Model} model
-	 * @param {Backbone.Collection} collection
+	 * @param {Array|Object} content Views to register to '.media-modal-content'
+	 * @returns {wp.media.view.Modal} Returns itself to allow chaining
 	 */
-	details: function( model, collection ) {
-		var selection = this.options.selection,
-			details;
-
-		if ( selection !== collection ) {
-			return;
-		}
-
-		details = selection.single();
-		this.$el.toggleClass( 'details', details === this.model );
+	content: function( content ) {
+		this.views.set( '.media-modal-content', content );
+		return this;
 	},
+
 	/**
-	 * @param {string} size
-	 * @returns {Object}
+	 * Triggers a modal event and if the `propagate` option is set,
+	 * forwards events to the modal's controller.
+	 *
+	 * @param {string} id
+	 * @returns {wp.media.view.Modal} Returns itself to allow chaining
 	 */
-	imageSize: function( size ) {
-		var sizes = this.model.get('sizes'), matched = false;
-
-		size = size || 'medium';
-
-		// Use the provided image size if possible.
-		if ( sizes ) {
-			if ( sizes[ size ] ) {
-				matched = sizes[ size ];
-			} else if ( sizes.large ) {
-				matched = sizes.large;
-			} else if ( sizes.thumbnail ) {
-				matched = sizes.thumbnail;
-			} else if ( sizes.full ) {
-				matched = sizes.full;
-			}
+	propagate: function( id ) {
+		this.trigger( id );
 
-			if ( matched ) {
-				return _.clone( matched );
-			}
+		if ( this.options.propagate ) {
+			this.controller.trigger( id );
 		}
 
-		return {
-			url:         this.model.get('url'),
-			width:       this.model.get('width'),
-			height:      this.model.get('height'),
-			orientation: this.model.get('orientation')
-		};
+		return this;
 	},
 	/**
 	 * @param {Object} event
 	 */
-	updateSetting: function( event ) {
-		var $setting = $( event.target ).closest('[data-setting]'),
-			setting, value;
-
-		if ( ! $setting.length ) {
-			return;
+	keydown: function( event ) {
+		// Close the modal when escape is pressed.
+		if ( 27 === event.which && this.$el.is(':visible') ) {
+			this.escape();
+			event.stopImmediatePropagation();
 		}
+	}
+});
 
-		setting = $setting.data('setting');
-		value   = event.target.value;
-
-		if ( this.model.get( setting ) !== value ) {
-			this.save( setting, value );
-		}
-	},
+module.exports = Modal;
 
-	/**
-	 * Pass all the arguments to the model's save method.
-	 *
-	 * Records the aggregate status of all save requests and updates the
-	 * view's classes accordingly.
-	 */
-	save: function() {
-		var view = this,
-			save = this._save = this._save || { status: 'ready' },
-			request = this.model.save.apply( this.model, arguments ),
-			requests = save.requests ? $.when( request, save.requests ) : request;
+},{}],54:[function(require,module,exports){
+/**
+ * wp.media.view.PriorityList
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var PriorityList = wp.media.View.extend({
+	tagName:   'div',
 
-		// If we're waiting to remove 'Saved.', stop.
-		if ( save.savedTimer ) {
-			clearTimeout( save.savedTimer );
-		}
+	initialize: function() {
+		this._views = {};
 
-		this.updateSave('waiting');
-		save.requests = requests;
-		requests.always( function() {
-			// If we've performed another request since this one, bail.
-			if ( save.requests !== requests ) {
-				return;
-			}
+		this.set( _.extend( {}, this._views, this.options.views ), { silent: true });
+		delete this.options.views;
 
-			view.updateSave( requests.state() === 'resolved' ? 'complete' : 'error' );
-			save.savedTimer = setTimeout( function() {
-				view.updateSave('ready');
-				delete save.savedTimer;
-			}, 2000 );
-		});
+		if ( ! this.options.silent ) {
+			this.render();
+		}
 	},
 	/**
-	 * @param {string} status
-	 * @returns {wp.media.view.Attachment} Returns itself to allow chaining
+	 * @param {string} id
+	 * @param {wp.media.View|Object} view
+	 * @param {Object} options
+	 * @returns {wp.media.view.PriorityList} Returns itself to allow chaining
 	 */
-	updateSave: function( status ) {
-		var save = this._save = this._save || { status: 'ready' };
+	set: function( id, view, options ) {
+		var priority, views, index;
 
-		if ( status && status !== save.status ) {
-			this.$el.removeClass( 'save-' + save.status );
-			save.status = status;
+		options = options || {};
+
+		// Accept an object with an `id` : `view` mapping.
+		if ( _.isObject( id ) ) {
+			_.each( id, function( view, id ) {
+				this.set( id, view );
+			}, this );
+			return this;
 		}
 
-		this.$el.addClass( 'save-' + save.status );
-		return this;
-	},
+		if ( ! (view instanceof Backbone.View) ) {
+			view = this.toView( view, id, options );
+		}
+		view.controller = view.controller || this.controller;
 
-	updateAll: function() {
-		var $settings = this.$('[data-setting]'),
-			model = this.model,
-			changed;
+		this.unset( id );
 
-		changed = _.chain( $settings ).map( function( el ) {
-			var $input = $('input, textarea, select, [value]', el ),
-				setting, value;
+		priority = view.options.priority || 10;
+		views = this.views.get() || [];
 
-			if ( ! $input.length ) {
-				return;
+		_.find( views, function( existing, i ) {
+			if ( existing.options.priority > priority ) {
+				index = i;
+				return true;
 			}
+		});
 
-			setting = $(el).data('setting');
-			value = $input.val();
-
-			// Record the value if it changed.
-			if ( model.get( setting ) !== value ) {
-				return [ setting, value ];
-			}
-		}).compact().object().value();
+		this._views[ id ] = view;
+		this.views.add( view, {
+			at: _.isNumber( index ) ? index : views.length || 0
+		});
 
-		if ( ! _.isEmpty( changed ) ) {
-			model.save( changed );
-		}
+		return this;
 	},
 	/**
-	 * @param {Object} event
+	 * @param {string} id
+	 * @returns {wp.media.View}
 	 */
-	removeFromLibrary: function( event ) {
-		// Catch enter and space events
-		if ( 'keydown' === event.type && 13 !== event.keyCode && 32 !== event.keyCode ) {
-			return;
-		}
-
-		// Stop propagation so the model isn't selected.
-		event.stopPropagation();
-
-		this.collection.remove( this.model );
+	get: function( id ) {
+		return this._views[ id ];
 	},
-
 	/**
-	 * Add the model if it isn't in the selection, if it is in the selection,
-	 * remove it.
-	 *
-	 * @param  {[type]} event [description]
-	 * @return {[type]}       [description]
+	 * @param {string} id
+	 * @returns {wp.media.view.PriorityList}
 	 */
-	checkClickHandler: function ( event ) {
-		var selection = this.options.selection;
-		if ( ! selection ) {
-			return;
-		}
-		event.stopPropagation();
-		if ( selection.where( { id: this.model.get( 'id' ) } ).length ) {
-			selection.remove( this.model );
-			// Move focus back to the attachment tile (from the check).
-			this.$el.focus();
-		} else {
-			selection.add( this.model );
+	unset: function( id ) {
+		var view = this.get( id );
+
+		if ( view ) {
+			view.remove();
 		}
-	}
-});
 
-// Ensure settings remain in sync between attachment views.
-_.each({
-	caption: '_syncCaption',
-	title:   '_syncTitle',
-	artist:  '_syncArtist',
-	album:   '_syncAlbum'
-}, function( method, setting ) {
+		delete this._views[ id ];
+		return this;
+	},
 	/**
-	 * @param {Backbone.Model} model
-	 * @param {string} value
-	 * @returns {wp.media.view.Attachment} Returns itself to allow chaining
+	 * @param {Object} options
+	 * @returns {wp.media.View}
 	 */
-	Attachment.prototype[ method ] = function( model, value ) {
-		var $setting = this.$('[data-setting="' + setting + '"]');
-
-		if ( ! $setting.length ) {
-			return this;
-		}
-
-		// If the updated value is in sync with the value in the DOM, there
-		// is no need to re-render. If we're currently editing the value,
-		// it will automatically be in sync, suppressing the re-render for
-		// the view we're editing, while updating any others.
-		if ( value === $setting.find('input, textarea, select, [value]').val() ) {
-			return this;
-		}
-
-		return this.render();
-	};
-});
-
-module.exports = Attachment;
-
-
-/***/ }),
-/* 70 */
-/***/ (function(module, exports) {
-
-/**
- * wp.media.view.Attachment.Library
- *
- * @class
- * @augments wp.media.view.Attachment
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var Library = wp.media.view.Attachment.extend({
-	buttons: {
-		check: true
+	toView: function( options ) {
+		return new wp.media.View( options );
 	}
 });
 
-module.exports = Library;
-
-
-/***/ }),
-/* 71 */
-/***/ (function(module, exports) {
+module.exports = PriorityList;
 
+},{}],55:[function(require,module,exports){
 /**
- * wp.media.view.Attachment.EditLibrary
+ * wp.media.view.RouterItem
  *
  * @class
- * @augments wp.media.view.Attachment
+ * @augments wp.media.view.MenuItem
  * @augments wp.media.View
  * @augments wp.Backbone.View
  * @augments Backbone.View
  */
-var EditLibrary = wp.media.view.Attachment.extend({
-	buttons: {
-		close: true
+var RouterItem = wp.media.view.MenuItem.extend({
+	/**
+	 * On click handler to activate the content region's corresponding mode.
+	 */
+	click: function() {
+		var contentMode = this.options.contentMode;
+		if ( contentMode ) {
+			this.controller.content.mode( contentMode );
+		}
 	}
 });
 
-module.exports = EditLibrary;
-
-
-/***/ }),
-/* 72 */
-/***/ (function(module, exports) {
+module.exports = RouterItem;
 
+},{}],56:[function(require,module,exports){
 /**
- * wp.media.view.Attachments
+ * wp.media.view.Router
  *
  * @class
+ * @augments wp.media.view.Menu
+ * @augments wp.media.view.PriorityList
  * @augments wp.media.View
  * @augments wp.Backbone.View
  * @augments Backbone.View
  */
-var View = wp.media.View,
-	$ = jQuery,
-	Attachments;
-
-Attachments = View.extend({
-	tagName:   'ul',
-	className: 'attachments',
+var Menu = wp.media.view.Menu,
+	Router;
 
-	attributes: {
-		tabIndex: -1
-	},
+Router = Menu.extend({
+	tagName:   'div',
+	className: 'media-router',
+	property:  'contentMode',
+	ItemView:  wp.media.view.RouterItem,
+	region:    'router',
 
 	initialize: function() {
-		this.el.id = _.uniqueId('__attachments-view-');
-
-		_.defaults( this.options, {
-			refreshSensitivity: wp.media.isTouchDevice ? 300 : 200,
-			refreshThreshold:   3,
-			AttachmentView:     wp.media.view.Attachment,
-			sortable:           false,
-			resize:             true,
-			idealColumnWidth:   $( window ).width() < 640 ? 135 : 150
-		});
-
-		this._viewsByCid = {};
-		this.$window = $( window );
-		this.resizeEvent = 'resize.media-modal-columns';
-
-		this.collection.on( 'add', function( attachment ) {
-			this.views.add( this.createAttachmentView( attachment ), {
-				at: this.collection.indexOf( attachment )
-			});
-		}, this );
-
-		this.collection.on( 'remove', function( attachment ) {
-			var view = this._viewsByCid[ attachment.cid ];
-			delete this._viewsByCid[ attachment.cid ];
-
-			if ( view ) {
-				view.remove();
-			}
-		}, this );
-
-		this.collection.on( 'reset', this.render, this );
-
-		this.listenTo( this.controller, 'library:selection:add',    this.attachmentFocus );
-
-		// Throttle the scroll handler and bind this.
-		this.scroll = _.chain( this.scroll ).bind( this ).throttle( this.options.refreshSensitivity ).value();
-
-		this.options.scrollElement = this.options.scrollElement || this.el;
-		$( this.options.scrollElement ).on( 'scroll', this.scroll );
-
-		this.initSortable();
-
-		_.bindAll( this, 'setColumns' );
-
-		if ( this.options.resize ) {
-			this.on( 'ready', this.bindEvents );
-			this.controller.on( 'open', this.setColumns );
-
-			// Call this.setColumns() after this view has been rendered in the DOM so
-			// attachments get proper width applied.
-			_.defer( this.setColumns, this );
-		}
-	},
-
-	bindEvents: function() {
-		this.$window.off( this.resizeEvent ).on( this.resizeEvent, _.debounce( this.setColumns, 50 ) );
-	},
-
-	attachmentFocus: function() {
-		this.$( 'li:first' ).focus();
-	},
-
-	restoreFocus: function() {
-		this.$( 'li.selected:first' ).focus();
-	},
-
-	arrowEvent: function( event ) {
-		var attachments = this.$el.children( 'li' ),
-			perRow = this.columns,
-			index = attachments.filter( ':focus' ).index(),
-			row = ( index + 1 ) <= perRow ? 1 : Math.ceil( ( index + 1 ) / perRow );
-
-		if ( index === -1 ) {
-			return;
-		}
-
-		// Left arrow
-		if ( 37 === event.keyCode ) {
-			if ( 0 === index ) {
-				return;
-			}
-			attachments.eq( index - 1 ).focus();
-		}
-
-		// Up arrow
-		if ( 38 === event.keyCode ) {
-			if ( 1 === row ) {
-				return;
-			}
-			attachments.eq( index - perRow ).focus();
-		}
-
-		// Right arrow
-		if ( 39 === event.keyCode ) {
-			if ( attachments.length === index ) {
-				return;
-			}
-			attachments.eq( index + 1 ).focus();
-		}
-
-		// Down arrow
-		if ( 40 === event.keyCode ) {
-			if ( Math.ceil( attachments.length / perRow ) === row ) {
-				return;
-			}
-			attachments.eq( index + perRow ).focus();
-		}
-	},
-
-	dispose: function() {
-		this.collection.props.off( null, null, this );
-		if ( this.options.resize ) {
-			this.$window.off( this.resizeEvent );
-		}
-
-		/**
-		 * call 'dispose' directly on the parent class
-		 */
-		View.prototype.dispose.apply( this, arguments );
-	},
-
-	setColumns: function() {
-		var prev = this.columns,
-			width = this.$el.width();
-
-		if ( width ) {
-			this.columns = Math.min( Math.round( width / this.options.idealColumnWidth ), 12 ) || 1;
-
-			if ( ! prev || prev !== this.columns ) {
-				this.$el.closest( '.media-frame-content' ).attr( 'data-columns', this.columns );
-			}
-		}
-	},
-
-	initSortable: function() {
-		var collection = this.collection;
-
-		if ( wp.media.isTouchDevice || ! this.options.sortable || ! $.fn.sortable ) {
-			return;
-		}
-
-		this.$el.sortable( _.extend({
-			// If the `collection` has a `comparator`, disable sorting.
-			disabled: !! collection.comparator,
-
-			// Change the position of the attachment as soon as the
-			// mouse pointer overlaps a thumbnail.
-			tolerance: 'pointer',
-
-			// Record the initial `index` of the dragged model.
-			start: function( event, ui ) {
-				ui.item.data('sortableIndexStart', ui.item.index());
-			},
-
-			// Update the model's index in the collection.
-			// Do so silently, as the view is already accurate.
-			update: function( event, ui ) {
-				var model = collection.at( ui.item.data('sortableIndexStart') ),
-					comparator = collection.comparator;
-
-				// Temporarily disable the comparator to prevent `add`
-				// from re-sorting.
-				delete collection.comparator;
-
-				// Silently shift the model to its new index.
-				collection.remove( model, {
-					silent: true
-				});
-				collection.add( model, {
-					silent: true,
-					at:     ui.item.index()
-				});
-
-				// Restore the comparator.
-				collection.comparator = comparator;
-
-				// Fire the `reset` event to ensure other collections sync.
-				collection.trigger( 'reset', collection );
-
-				// If the collection is sorted by menu order,
-				// update the menu order.
-				collection.saveMenuOrder();
-			}
-		}, this.options.sortable ) );
-
-		// If the `orderby` property is changed on the `collection`,
-		// check to see if we have a `comparator`. If so, disable sorting.
-		collection.props.on( 'change:orderby', function() {
-			this.$el.sortable( 'option', 'disabled', !! collection.comparator );
-		}, this );
-
-		this.collection.props.on( 'change:orderby', this.refreshSortable, this );
-		this.refreshSortable();
-	},
-
-	refreshSortable: function() {
-		if ( wp.media.isTouchDevice || ! this.options.sortable || ! $.fn.sortable ) {
-			return;
-		}
-
-		// If the `collection` has a `comparator`, disable sorting.
-		var collection = this.collection,
-			orderby = collection.props.get('orderby'),
-			enabled = 'menuOrder' === orderby || ! collection.comparator;
-
-		this.$el.sortable( 'option', 'disabled', ! enabled );
-	},
-
-	/**
-	 * @param {wp.media.model.Attachment} attachment
-	 * @returns {wp.media.View}
-	 */
-	createAttachmentView: function( attachment ) {
-		var view = new this.options.AttachmentView({
-			controller:           this.controller,
-			model:                attachment,
-			collection:           this.collection,
-			selection:            this.options.selection
-		});
-
-		return this._viewsByCid[ attachment.cid ] = view;
-	},
-
-	prepare: function() {
-		// Create all of the Attachment views, and replace
-		// the list in a single DOM operation.
-		if ( this.collection.length ) {
-			this.views.set( this.collection.map( this.createAttachmentView, this ) );
-
-		// If there are no elements, clear the views and load some.
-		} else {
-			this.views.unset();
-			this.collection.more().done( this.scroll );
-		}
-	},
-
-	ready: function() {
-		// Trigger the scroll event to check if we're within the
-		// threshold to query for additional attachments.
-		this.scroll();
+		this.controller.on( 'content:render', this.update, this );
+		// Call 'initialize' directly on the parent class.
+		Menu.prototype.initialize.apply( this, arguments );
 	},
 
-	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();
-			});
+	update: function() {
+		var mode = this.controller.content.mode();
+		if ( mode ) {
+			this.select( mode );
 		}
 	}
 });
 
-module.exports = Attachments;
-
-
-/***/ }),
-/* 73 */
-/***/ (function(module, exports) {
+module.exports = Router;
 
+},{}],57:[function(require,module,exports){
 /**
  * wp.media.view.Search
  *
@@ -6690,742 +7075,7 @@ Search = wp.media.View.extend({
 
 module.exports = Search;
 
-
-/***/ }),
-/* 74 */
-/***/ (function(module, exports) {
-
-/**
- * wp.media.view.AttachmentFilters
- *
- * @class
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var $ = jQuery,
-	AttachmentFilters;
-
-AttachmentFilters = wp.media.View.extend({
-	tagName:   'select',
-	className: 'attachment-filters',
-	id:        'media-attachment-filters',
-
-	events: {
-		change: 'change'
-	},
-
-	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();
-	},
-
-	/**
-	 * @abstract
-	 */
-	createFilters: function() {
-		this.filters = {};
-	},
-
-	/**
-	 * When the selected filter changes, update the Attachment Query properties to match.
-	 */
-	change: function() {
-		var filter = this.filters[ this.el.value ];
-		if ( filter ) {
-			this.model.set( filter.props );
-		}
-	},
-
-	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;
-			}
-		});
-
-		this.$el.val( value );
-	}
-});
-
-module.exports = AttachmentFilters;
-
-
-/***/ }),
-/* 75 */
-/***/ (function(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;
-
-DateFilter = wp.media.view.AttachmentFilters.extend({
-	id: 'media-attachment-date-filters',
-
-	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;
-	}
-});
-
-module.exports = DateFilter;
-
-
-/***/ }),
-/* 76 */
-/***/ (function(module, exports) {
-
-/**
- * wp.media.view.AttachmentFilters.Uploaded
- *
- * @class
- * @augments wp.media.view.AttachmentFilters
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var l10n = wp.media.view.l10n,
-	Uploaded;
-
-Uploaded = wp.media.view.AttachmentFilters.extend({
-	createFilters: function() {
-		var type = this.model.get('type'),
-			types = wp.media.view.settings.mimeTypes,
-			text;
-
-		if ( types && type ) {
-			text = types[ type ];
-		}
-
-		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
-			}
-		};
-	}
-});
-
-module.exports = Uploaded;
-
-
-/***/ }),
-/* 77 */
-/***/ (function(module, exports) {
-
-/**
- * wp.media.view.AttachmentFilters.All
- *
- * @class
- * @augments wp.media.view.AttachmentFilters
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var l10n = wp.media.view.l10n,
-	All;
-
-All = wp.media.view.AttachmentFilters.extend({
-	createFilters: function() {
-		var filters = {};
-
-		_.each( wp.media.view.settings.mimeTypes || {}, function( text, key ) {
-			filters[ key ] = {
-				text: text,
-				props: {
-					status:  null,
-					type:    key,
-					uploadedTo: null,
-					orderby: 'date',
-					order:   'DESC'
-				}
-			};
-		});
-
-		filters.all = {
-			text:  l10n.allMediaItems,
-			props: {
-				status:  null,
-				type:    null,
-				uploadedTo: null,
-				orderby: 'date',
-				order:   'DESC'
-			},
-			priority: 10
-		};
-
-		if ( wp.media.view.settings.post.id ) {
-			filters.uploaded = {
-				text:  l10n.uploadedToThisPost,
-				props: {
-					status:  null,
-					type:    null,
-					uploadedTo: wp.media.view.settings.post.id,
-					orderby: 'menuOrder',
-					order:   'ASC'
-				},
-				priority: 20
-			};
-		}
-
-		filters.unattached = {
-			text:  l10n.unattached,
-			props: {
-				status:     null,
-				uploadedTo: 0,
-				type:       null,
-				orderby:    'menuOrder',
-				order:      'ASC'
-			},
-			priority: 50
-		};
-
-		if ( wp.media.view.settings.mediaTrash &&
-			this.controller.isModeActive( 'grid' ) ) {
-
-			filters.trash = {
-				text:  l10n.trash,
-				props: {
-					uploadedTo: null,
-					status:     'trash',
-					type:       null,
-					orderby:    'date',
-					order:      'DESC'
-				},
-				priority: 50
-			};
-		}
-
-		this.filters = filters;
-	}
-});
-
-module.exports = All;
-
-
-/***/ }),
-/* 78 */
-/***/ (function(module, exports) {
-
-/**
- * wp.media.view.AttachmentsBrowser
- *
- * @class
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- *
- * @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'.
- */
-var View = wp.media.View,
-	mediaTrash = wp.media.view.settings.mediaTrash,
-	l10n = wp.media.view.l10n,
-	$ = jQuery,
-	AttachmentsBrowser;
-
-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 );
-	},
-
-	editSelection: function( modal ) {
-		modal.$( '.media-button-backToLibrary' ).focus();
-	},
-
-	/**
-	 * @returns {wp.media.view.AttachmentsBrowser} Returns itself to allow chaining
-	 */
-	dispose: function() {
-		this.options.selection.off( null, null, this );
-		View.prototype.dispose.apply( this, arguments );
-		return this;
-	},
-
-	createToolbar: function() {
-		var LibraryViewSwitcher, Filters, toolbarOptions;
-
-		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 );
-						} else {
-							model.destroy({wait: true});
-						}
-					} );
-
-					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' );
-					}
-				}
-			}).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() );
-			}
-
-		} 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
-		}) );
-
-		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' );
-	}
-});
-
-module.exports = AttachmentsBrowser;
-
-
-/***/ }),
-/* 79 */
-/***/ (function(module, exports) {
-
+},{}],58:[function(require,module,exports){
 /**
  * wp.media.view.Selection
  *
@@ -7508,94 +7158,7 @@ Selection = wp.media.View.extend({
 
 module.exports = Selection;
 
-
-/***/ }),
-/* 80 */
-/***/ (function(module, exports) {
-
-/**
- * wp.media.view.Attachment.Selection
- *
- * @class
- * @augments wp.media.view.Attachment
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var Selection = wp.media.view.Attachment.extend({
-	className: 'attachment selection',
-
-	// On click, just select the model, instead of removing the model from
-	// the selection.
-	toggleSelection: function() {
-		this.options.selection.single( this.model );
-	}
-});
-
-module.exports = Selection;
-
-
-/***/ }),
-/* 81 */
-/***/ (function(module, exports) {
-
-/**
- * wp.media.view.Attachments.Selection
- *
- * @class
- * @augments wp.media.view.Attachments
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var Attachments = wp.media.view.Attachments,
-	Selection;
-
-Selection = Attachments.extend({
-	events: {},
-	initialize: function() {
-		_.defaults( this.options, {
-			sortable:   false,
-			resize:     false,
-
-			// 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;
-
-
-/***/ }),
-/* 82 */
-/***/ (function(module, exports) {
-
-/**
- * wp.media.view.Attachments.EditSelection
- *
- * @class
- * @augments wp.media.view.Attachment.Selection
- * @augments wp.media.view.Attachment
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var EditSelection = wp.media.view.Attachment.Selection.extend({
-	buttons: {
-		close: true
-	}
-});
-
-module.exports = EditSelection;
-
-
-/***/ }),
-/* 83 */
-/***/ (function(module, exports) {
-
+},{}],59:[function(require,module,exports){
 /**
  * wp.media.view.Settings
  *
@@ -7716,11 +7279,7 @@ Settings = View.extend({
 
 module.exports = Settings;
 
-
-/***/ }),
-/* 84 */
-/***/ (function(module, exports) {
-
+},{}],60:[function(require,module,exports){
 /**
  * wp.media.view.Settings.AttachmentDisplay
  *
@@ -7814,11 +7373,7 @@ AttachmentDisplay = Settings.extend({
 
 module.exports = AttachmentDisplay;
 
-
-/***/ }),
-/* 85 */
-/***/ (function(module, exports) {
-
+},{}],61:[function(require,module,exports){
 /**
  * wp.media.view.Settings.Gallery
  *
@@ -7835,11 +7390,7 @@ var Gallery = wp.media.view.Settings.extend({
 
 module.exports = Gallery;
 
-
-/***/ }),
-/* 86 */
-/***/ (function(module, exports) {
-
+},{}],62:[function(require,module,exports){
 /**
  * wp.media.view.Settings.Playlist
  *
@@ -7856,157 +7407,162 @@ var Playlist = wp.media.view.Settings.extend({
 
 module.exports = Playlist;
 
+},{}],63:[function(require,module,exports){
+/**
+ * wp.media.view.Sidebar
+ *
+ * @class
+ * @augments wp.media.view.PriorityList
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Sidebar = wp.media.view.PriorityList.extend({
+	className: 'media-sidebar'
+});
 
-/***/ }),
-/* 87 */
-/***/ (function(module, exports) {
+module.exports = Sidebar;
 
+},{}],64:[function(require,module,exports){
 /**
- * wp.media.view.Attachment.Details
+ * wp.media.view.SiteIconCropper
+ *
+ * Uses the imgAreaSelect plugin to allow a user to crop a Site Icon.
+ *
+ * Takes imgAreaSelect options from
+ * wp.customize.SiteIconControl.calculateImageSelectOptions.
  *
  * @class
- * @augments wp.media.view.Attachment
+ * @augments wp.media.view.Cropper
  * @augments wp.media.View
  * @augments wp.Backbone.View
  * @augments Backbone.View
  */
-var Attachment = wp.media.view.Attachment,
-	l10n = wp.media.view.l10n,
-	Details;
+var View = wp.media.view,
+	SiteIconCropper;
 
-Details = Attachment.extend({
-	tagName:   'div',
-	className: 'attachment-details',
-	template:  wp.template('attachment-details'),
+SiteIconCropper = View.Cropper.extend({
+	className: 'crop-content site-icon',
 
-	attributes: function() {
-		return {
-			'tabIndex':     0,
-			'data-id':      this.model.get( 'id' )
-		};
-	},
+	ready: function () {
+		View.Cropper.prototype.ready.apply( this, arguments );
 
-	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'
+		this.$( '.crop-image' ).on( 'load', _.bind( this.addSidebar, this ) );
 	},
 
-	initialize: function() {
-		this.options = _.defaults( this.options, {
-			rerenderOnModelChange: false
+	addSidebar: function() {
+		this.sidebar = new wp.media.view.Sidebar({
+			controller: this.controller
 		});
 
-		this.on( 'ready', this.initialFocus );
-		// Call 'initialize' directly on the parent class.
-		Attachment.prototype.initialize.apply( this, arguments );
-	},
+		this.sidebar.set( 'preview', new wp.media.view.SiteIconPreview({
+			controller: this.controller,
+			attachment: this.options.attachment
+		}) );
 
-	initialFocus: function() {
-		if ( ! wp.media.isTouchDevice ) {
-			/*
-			Previously focused the first ':input' (the readonly URL text field).
-			Since the first ':input' is now a button (delete/trash): when pressing
-			spacebar on an attachment, Firefox fires deleteAttachment/trashAttachment
-			as soon as focus is moved. Explicitly target the first text field for now.
-			@todo change initial focus logic, also for accessibility.
-			*/
-			this.$( 'input[type="text"]' ).eq( 0 ).focus();
-		}
-	},
-	/**
-	 * @param {Object} event
-	 */
-	deleteAttachment: function( event ) {
-		event.preventDefault();
+		this.controller.cropperView.views.add( this.sidebar );
+	}
+});
 
-		if ( window.confirm( l10n.warnDelete ) ) {
-			this.model.destroy();
-			// Keep focus inside media modal
-			// after image is deleted
-			this.controller.modal.focusManager.focus();
-		}
-	},
-	/**
-	 * @param {Object} event
-	 */
-	trashAttachment: function( event ) {
-		var library = this.controller.library;
-		event.preventDefault();
+module.exports = SiteIconCropper;
 
-		if ( wp.media.view.settings.mediaTrash &&
-			'edit-metadata' === this.controller.content.mode() ) {
+},{}],65:[function(require,module,exports){
+/**
+ * wp.media.view.SiteIconPreview
+ *
+ * Shows a preview of the Site Icon as a favicon and app icon while cropping.
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var View = wp.media.View,
+	$ = jQuery,
+	SiteIconPreview;
 
-			this.model.set( 'status', 'trash' );
-			this.model.save().done( function() {
-				library._requery( true );
-			} );
-		}  else {
-			this.model.destroy();
-		}
-	},
-	/**
-	 * @param {Object} event
-	 */
-	untrashAttachment: function( event ) {
-		var library = this.controller.library;
-		event.preventDefault();
+SiteIconPreview = View.extend({
+	className: 'site-icon-preview',
+	template: wp.template( 'site-icon-preview' ),
 
-		this.model.set( 'status', 'inherit' );
-		this.model.save().done( function() {
-			library._requery( true );
-		} );
+	ready: function() {
+		this.controller.imgSelect.setOptions({
+			onInit: this.updatePreview,
+			onSelectChange: this.updatePreview
+		});
 	},
-	/**
-	 * @param {Object} event
-	 */
-	editAttachment: function( event ) {
-		var editState = this.controller.states.get( 'edit-image' );
-		if ( window.imageEdit && editState ) {
-			event.preventDefault();
 
-			editState.set( 'image', this.model );
-			this.controller.setState( 'edit-image' );
-		} else {
-			this.$el.addClass('needs-refresh');
-		}
+	prepare: function() {
+		return {
+			url: this.options.attachment.get( 'url' )
+		};
 	},
-	/**
-	 * When reverse tabbing(shift+tab) out of the right details panel, deliver
-	 * the focus to the item in the list that was being edited.
-	 *
-	 * @param {Object} event
-	 */
-	toggleSelectionHandler: function( event ) {
-		if ( 'keydown' === event.type && 9 === event.keyCode && event.shiftKey && event.target === this.$( ':tabbable' ).get( 0 ) ) {
-			this.controller.trigger( 'attachment:details:shift-tab', event );
-			return false;
-		}
 
-		if ( 37 === event.keyCode || 38 === event.keyCode || 39 === event.keyCode || 40 === event.keyCode ) {
-			this.controller.trigger( 'attachment:keydown:arrow', event );
-			return;
-		}
+	updatePreview: function( img, coords ) {
+		var rx = 64 / coords.width,
+			ry = 64 / coords.height,
+			preview_rx = 16 / coords.width,
+			preview_ry = 16 / coords.height;
+
+		$( '#preview-app-icon' ).css({
+			width: Math.round(rx * this.imageWidth ) + 'px',
+			height: Math.round(ry * this.imageHeight ) + 'px',
+			marginLeft: '-' + Math.round(rx * coords.x1) + 'px',
+			marginTop: '-' + Math.round(ry * coords.y1) + 'px'
+		});
+
+		$( '#preview-favicon' ).css({
+			width: Math.round( preview_rx * this.imageWidth ) + 'px',
+			height: Math.round( preview_ry * this.imageHeight ) + 'px',
+			marginLeft: '-' + Math.round( preview_rx * coords.x1 ) + 'px',
+			marginTop: '-' + Math.floor( preview_ry* coords.y1 ) + 'px'
+		});
 	}
 });
 
-module.exports = Details;
+module.exports = SiteIconPreview;
+
+},{}],66:[function(require,module,exports){
+/**
+ * wp.media.view.Spinner
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var Spinner = wp.media.View.extend({
+	tagName:   'span',
+	className: 'spinner',
+	spinnerTimeout: false,
+	delay: 400,
+
+	show: function() {
+		if ( ! this.spinnerTimeout ) {
+			this.spinnerTimeout = _.delay(function( $el ) {
+				$el.addClass( 'is-active' );
+			}, this.delay, this.$el );
+		}
 
+		return this;
+	},
+
+	hide: function() {
+		this.$el.removeClass( 'is-active' );
+		this.spinnerTimeout = clearTimeout( this.spinnerTimeout );
 
-/***/ }),
-/* 88 */
-/***/ (function(module, exports) {
+		return this;
+	}
+});
+
+module.exports = Spinner;
 
+},{}],67:[function(require,module,exports){
 /**
- * wp.media.view.AttachmentCompat
+ * wp.media.view.Toolbar
  *
- * A view to display fields added via the `attachment_fields_to_edit` filter.
+ * A toolbar which consists of a primary and a secondary section. Each sections
+ * can be filled with views.
  *
  * @class
  * @augments wp.media.View
@@ -8014,212 +7570,266 @@ module.exports = Details;
  * @augments Backbone.View
  */
 var View = wp.media.View,
-	AttachmentCompat;
-
-AttachmentCompat = View.extend({
-	tagName:   'form',
-	className: 'compat-item',
+	Toolbar;
 
-	events: {
-		'submit':          'preventDefault',
-		'change input':    'save',
-		'change select':   'save',
-		'change textarea': 'save'
-	},
+Toolbar = View.extend({
+	tagName:   'div',
+	className: 'media-toolbar',
 
 	initialize: function() {
-		this.listenTo( this.model, 'change:compat', this.render );
+		var state = this.controller.state(),
+			selection = this.selection = state.get('selection'),
+			library = this.library = state.get('library');
+
+		this._views = {};
+
+		// The toolbar is composed of two `PriorityList` views.
+		this.primary   = new wp.media.view.PriorityList();
+		this.secondary = new wp.media.view.PriorityList();
+		this.primary.$el.addClass('media-toolbar-primary search-form');
+		this.secondary.$el.addClass('media-toolbar-secondary');
+
+		this.views.set([ this.secondary, this.primary ]);
+
+		if ( this.options.items ) {
+			this.set( this.options.items, { silent: true });
+		}
+
+		if ( ! this.options.silent ) {
+			this.render();
+		}
+
+		if ( selection ) {
+			selection.on( 'add remove reset', this.refresh, this );
+		}
+
+		if ( library ) {
+			library.on( 'add remove reset', this.refresh, this );
+		}
 	},
 	/**
-	 * @returns {wp.media.view.AttachmentCompat} Returns itself to allow chaining
+	 * @returns {wp.media.view.Toolbar} Returns itsef to allow chaining
 	 */
 	dispose: function() {
-		if ( this.$(':focus').length ) {
-			this.save();
+		if ( this.selection ) {
+			this.selection.off( null, null, this );
+		}
+
+		if ( this.library ) {
+			this.library.off( null, null, this );
 		}
 		/**
 		 * call 'dispose' directly on the parent class
 		 */
 		return View.prototype.dispose.apply( this, arguments );
 	},
+
+	ready: function() {
+		this.refresh();
+	},
+
 	/**
-	 * @returns {wp.media.view.AttachmentCompat} Returns itself to allow chaining
+	 * @param {string} id
+	 * @param {Backbone.View|Object} view
+	 * @param {Object} [options={}]
+	 * @returns {wp.media.view.Toolbar} Returns itself to allow chaining
 	 */
-	render: function() {
-		var compat = this.model.get('compat');
-		if ( ! compat || ! compat.item ) {
-			return;
+	set: function( id, view, options ) {
+		var list;
+		options = options || {};
+
+		// Accept an object with an `id` : `view` mapping.
+		if ( _.isObject( id ) ) {
+			_.each( id, function( view, id ) {
+				this.set( id, view, { silent: true });
+			}, this );
+
+		} else {
+			if ( ! ( view instanceof Backbone.View ) ) {
+				view.classes = [ 'media-button-' + id ].concat( view.classes || [] );
+				view = new wp.media.view.Button( view ).render();
+			}
+
+			view.controller = view.controller || this.controller;
+
+			this._views[ id ] = view;
+
+			list = view.options.priority < 0 ? 'secondary' : 'primary';
+			this[ list ].set( id, view, options );
+		}
+
+		if ( ! options.silent ) {
+			this.refresh();
 		}
 
-		this.views.detach();
-		this.$el.html( compat.item );
-		this.views.render();
 		return this;
 	},
 	/**
-	 * @param {Object} event
+	 * @param {string} id
+	 * @returns {wp.media.view.Button}
 	 */
-	preventDefault: function( event ) {
-		event.preventDefault();
+	get: function( id ) {
+		return this._views[ id ];
 	},
 	/**
-	 * @param {Object} event
+	 * @param {string} id
+	 * @param {Object} options
+	 * @returns {wp.media.view.Toolbar} Returns itself to allow chaining
 	 */
-	save: function( event ) {
-		var data = {};
+	unset: function( id, options ) {
+		delete this._views[ id ];
+		this.primary.unset( id, options );
+		this.secondary.unset( id, options );
 
-		if ( event ) {
-			event.preventDefault();
+		if ( ! options || ! options.silent ) {
+			this.refresh();
 		}
-
-		_.each( this.$el.serializeArray(), function( pair ) {
-			data[ pair.name ] = pair.value;
-		});
-
-		this.controller.trigger( 'attachment:compat:waiting', ['waiting'] );
-		this.model.saveCompat( data ).always( _.bind( this.postSave, this ) );
+		return this;
 	},
 
-	postSave: function() {
-		this.controller.trigger( 'attachment:compat:ready', ['ready'] );
-	}
-});
+	refresh: function() {
+		var state = this.controller.state(),
+			library = state.get('library'),
+			selection = state.get('selection');
 
-module.exports = AttachmentCompat;
+		_.each( this._views, function( button ) {
+			if ( ! button.model || ! button.options || ! button.options.requires ) {
+				return;
+			}
 
+			var requires = button.options.requires,
+				disabled = false;
 
-/***/ }),
-/* 89 */
-/***/ (function(module, exports) {
+			// Prevent insertion of attachments if any of them are still uploading
+			disabled = _.some( selection.models, function( attachment ) {
+				return attachment.get('uploading') === true;
+			});
 
-/**
- * wp.media.view.Iframe
- *
- * @class
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var Iframe = wp.media.View.extend({
-	className: 'media-iframe',
-	/**
-	 * @returns {wp.media.view.Iframe} Returns itself to allow chaining
-	 */
-	render: function() {
-		this.views.detach();
-		this.$el.html( '<iframe src="' + this.controller.state().get('src') + '" />' );
-		this.views.render();
-		return this;
+			if ( requires.selection && selection && ! selection.length ) {
+				disabled = true;
+			} else if ( requires.library && library && ! library.length ) {
+				disabled = true;
+			}
+			button.model.set( 'disabled', disabled );
+		});
 	}
 });
 
-module.exports = Iframe;
-
-
-/***/ }),
-/* 90 */
-/***/ (function(module, exports) {
+module.exports = Toolbar;
 
+},{}],68:[function(require,module,exports){
 /**
- * wp.media.view.Embed
+ * wp.media.view.Toolbar.Embed
  *
  * @class
+ * @augments wp.media.view.Toolbar.Select
+ * @augments wp.media.view.Toolbar
  * @augments wp.media.View
  * @augments wp.Backbone.View
  * @augments Backbone.View
  */
-var Embed = wp.media.View.extend({
-	className: 'media-embed',
+var Select = wp.media.view.Toolbar.Select,
+	l10n = wp.media.view.l10n,
+	Embed;
 
+Embed = Select.extend({
 	initialize: function() {
-		/**
-		 * @member {wp.media.view.EmbedUrl}
-		 */
-		this.url = new wp.media.view.EmbedUrl({
-			controller: this.controller,
-			model:      this.model.props
-		}).render();
-
-		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();
-		}
-		this._settings = view;
-		this.views.add( view );
+		_.defaults( this.options, {
+			text: l10n.insertIntoPost,
+			requires: false
+		});
+		// Call 'initialize' directly on the parent class.
+		Select.prototype.initialize.apply( this, arguments );
 	},
 
 	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
-		}) );
-	},
-
-	loading: function() {
-		this.$el.toggleClass( 'embed-loading', this.model.get('loading') );
+		var url = this.controller.state().props.get('url');
+		this.get('select').model.set( 'disabled', ! url || url === 'http://' );
+		/**
+		 * call 'refresh' directly on the parent class
+		 */
+		Select.prototype.refresh.apply( this, arguments );
 	}
 });
 
 module.exports = Embed;
 
-
-/***/ }),
-/* 91 */
-/***/ (function(module, exports) {
-
+},{}],69:[function(require,module,exports){
 /**
- * wp.media.view.Label
+ * wp.media.view.Toolbar.Select
  *
  * @class
+ * @augments wp.media.view.Toolbar
  * @augments wp.media.View
  * @augments wp.Backbone.View
  * @augments Backbone.View
  */
-var Label = wp.media.View.extend({
-	tagName: 'label',
-	className: 'screen-reader-text',
+var Toolbar = wp.media.view.Toolbar,
+	l10n = wp.media.view.l10n,
+	Select;
 
+Select = Toolbar.extend({
 	initialize: function() {
-		this.value = this.options.value;
+		var options = this.options;
+
+		_.bindAll( this, 'clickSelect' );
+
+		_.defaults( options, {
+			event: 'select',
+			state: false,
+			reset: true,
+			close: true,
+			text:  l10n.select,
+
+			// Does the button rely on the selection?
+			requires: {
+				selection: true
+			}
+		});
+
+		options.items = _.defaults( options.items || {}, {
+			select: {
+				style:    'primary',
+				text:     options.text,
+				priority: 80,
+				click:    this.clickSelect,
+				requires: options.requires
+			}
+		});
+		// Call 'initialize' directly on the parent class.
+		Toolbar.prototype.initialize.apply( this, arguments );
 	},
 
-	render: function() {
-		this.$el.html( this.value );
+	clickSelect: function() {
+		var options = this.options,
+			controller = this.controller;
 
-		return this;
-	}
-});
+		if ( options.close ) {
+			controller.close();
+		}
 
-module.exports = Label;
+		if ( options.event ) {
+			controller.state().trigger( options.event );
+		}
+
+		if ( options.state ) {
+			controller.setState( options.state );
+		}
 
+		if ( options.reset ) {
+			controller.reset();
+		}
+	}
+});
 
-/***/ }),
-/* 92 */
-/***/ (function(module, exports) {
+module.exports = Select;
 
+},{}],70:[function(require,module,exports){
 /**
- * wp.media.view.EmbedUrl
+ * Creates a dropzone on WP editor instances (elements with .wp-editor-wrap)
+ * and relays drag'n'dropped files to a media workflow.
+ *
+ * wp.media.view.EditorUploader
  *
  * @class
  * @augments wp.media.View
@@ -8227,390 +7837,370 @@ module.exports = Label;
  * @augments Backbone.View
  */
 var View = wp.media.View,
+	l10n = wp.media.view.l10n,
 	$ = jQuery,
-	EmbedUrl;
+	EditorUploader;
 
-EmbedUrl = View.extend({
-	tagName:   'label',
-	className: 'embed-url',
+EditorUploader = View.extend({
+	tagName:   'div',
+	className: 'uploader-editor',
+	template:  wp.template( 'uploader-editor' ),
 
-	events: {
-		'input':  'url',
-		'keyup':  'url',
-		'change': 'url'
-	},
+	localDrag: false,
+	overContainer: false,
+	overDropzone: false,
+	draggingFile: null,
 
+	/**
+	 * Bind drag'n'drop events to callbacks.
+	 */
 	initialize: function() {
-		this.$input = $('<input id="embed-url-field" type="url" />').val( this.model.get('url') );
-		this.input = this.$input[0];
+		this.initialized = false;
 
-		this.spinner = $('<span class="spinner" />')[0];
-		this.$el.append([ this.input, this.spinner ]);
+		// Bail if not enabled or UA does not support drag'n'drop or File API.
+		if ( ! window.tinyMCEPreInit || ! window.tinyMCEPreInit.dragDropUpload || ! this.browserSupport() ) {
+			return this;
+		}
 
-		this.listenTo( this.model, 'change:url', this.render );
+		this.$document = $(document);
+		this.dropzones = [];
+		this.files = [];
 
-		if ( this.model.get( 'url' ) ) {
-			_.delay( _.bind( function () {
-				this.model.trigger( 'change:url' );
-			}, this ), 500 );
-		}
-	},
-	/**
-	 * @returns {wp.media.view.EmbedUrl} Returns itself to allow chaining
-	 */
-	render: function() {
-		var $input = this.$input;
+		this.$document.on( 'drop', '.uploader-editor', _.bind( this.drop, this ) );
+		this.$document.on( 'dragover', '.uploader-editor', _.bind( this.dropzoneDragover, this ) );
+		this.$document.on( 'dragleave', '.uploader-editor', _.bind( this.dropzoneDragleave, this ) );
+		this.$document.on( 'click', '.uploader-editor', _.bind( this.click, this ) );
 
-		if ( $input.is(':focus') ) {
-			return;
-		}
+		this.$document.on( 'dragover', _.bind( this.containerDragover, this ) );
+		this.$document.on( 'dragleave', _.bind( this.containerDragleave, this ) );
 
-		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;
-	},
+		this.$document.on( 'dragstart dragend drop', _.bind( function( event ) {
+			this.localDrag = event.type === 'dragstart';
 
-	ready: function() {
-		if ( ! wp.media.isTouchDevice ) {
-			this.focus();
-		}
-	},
+			if ( event.type === 'drop' ) {
+				this.containerDragleave();
+			}
+		}, this ) );
 
-	url: function( event ) {
-		this.model.set( 'url', event.target.value );
+		this.initialized = true;
+		return this;
 	},
 
 	/**
-	 * If the input is visible, focus and select its contents.
+	 * Check browser support for drag'n'drop.
+	 *
+	 * @return Boolean
 	 */
-	focus: function() {
-		var $input = this.$input;
-		if ( $input.is(':visible') ) {
-			$input.focus()[0].select();
+	browserSupport: function() {
+		var supports = false, div = document.createElement('div');
+
+		supports = ( 'draggable' in div ) || ( 'ondragstart' in div && 'ondrop' in div );
+		supports = supports && !! ( window.File && window.FileList && window.FileReader );
+		return supports;
+	},
+
+	isDraggingFile: function( event ) {
+		if ( this.draggingFile !== null ) {
+			return this.draggingFile;
 		}
-	}
-});
 
-module.exports = EmbedUrl;
+		if ( _.isUndefined( event.originalEvent ) || _.isUndefined( event.originalEvent.dataTransfer ) ) {
+			return false;
+		}
 
+		this.draggingFile = _.indexOf( event.originalEvent.dataTransfer.types, 'Files' ) > -1 &&
+			_.indexOf( event.originalEvent.dataTransfer.types, 'text/plain' ) === -1;
 
-/***/ }),
-/* 93 */
-/***/ (function(module, exports) {
+		return this.draggingFile;
+	},
 
-/**
- * wp.media.view.EmbedLink
- *
- * @class
- * @augments wp.media.view.Settings
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var $ = jQuery,
-	EmbedLink;
+	refresh: function( e ) {
+		var dropzone_id;
+		for ( dropzone_id in this.dropzones ) {
+			// Hide the dropzones only if dragging has left the screen.
+			this.dropzones[ dropzone_id ].toggle( this.overContainer || this.overDropzone );
+		}
 
-EmbedLink = wp.media.view.Settings.extend({
-	className: 'embed-link-settings',
-	template:  wp.template('embed-link-settings'),
+		if ( ! _.isUndefined( e ) ) {
+			$( e.target ).closest( '.uploader-editor' ).toggleClass( 'droppable', this.overDropzone );
+		}
 
-	initialize: function() {
-		this.listenTo( this.model, 'change:url', this.updateoEmbed );
+		if ( ! this.overContainer && ! this.overDropzone ) {
+			this.draggingFile = null;
+		}
+
+		return this;
 	},
 
-	updateoEmbed: _.debounce( function() {
-		var url = this.model.get( 'url' );
+	render: function() {
+		if ( ! this.initialized ) {
+			return this;
+		}
 
-		// clear out previous results
-		this.$('.embed-container').hide().find('.embed-preview').empty();
-		this.$( '.setting' ).hide();
+		View.prototype.render.apply( this, arguments );
+		$( '.wp-editor-wrap' ).each( _.bind( this.attach, this ) );
+		return this;
+	},
 
-		// 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;
-		}
+	attach: function( index, editor ) {
+		// Attach a dropzone to an editor.
+		var dropzone = this.$el.clone();
+		this.dropzones.push( dropzone );
+		$( editor ).append( dropzone );
+		return this;
+	},
 
-		this.fetch();
-	}, wp.media.controller.Embed.sensitivity ),
+	/**
+	 * When a file is dropped on the editor uploader, open up an editor media workflow
+	 * and upload the file immediately.
+	 *
+	 * @param  {jQuery.Event} event The 'drop' event.
+	 */
+	drop: function( event ) {
+		var $wrap, uploadView;
 
-	fetch: function() {
-		var embed;
+		this.containerDragleave( event );
+		this.dropzoneDragleave( event );
 
-		// check if they haven't typed in 500 ms
-		if ( $('#embed-url-field').val() !== this.model.get('url') ) {
+		this.files = event.originalEvent.dataTransfer.files;
+		if ( this.files.length < 1 ) {
 			return;
 		}
 
-		if ( this.dfd && 'pending' === this.dfd.state() ) {
-			this.dfd.abort();
+		// Set the active editor to the drop target.
+		$wrap = $( event.target ).parents( '.wp-editor-wrap' );
+		if ( $wrap.length > 0 && $wrap[0].id ) {
+			window.wpActiveEditor = $wrap[0].id.slice( 3, -5 );
 		}
 
-		embed = new wp.shortcode({
-			tag: 'embed',
-			attrs: _.pick( this.model.attributes, [ 'width', 'height', 'src' ] ),
-			content: this.model.get('url')
-		});
+		if ( ! this.workflow ) {
+			this.workflow = wp.media.editor.open( window.wpActiveEditor, {
+				frame:    'post',
+				state:    'insert',
+				title:    l10n.addMedia,
+				multiple: true
+			});
 
-		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()
+			uploadView = this.workflow.uploader;
+
+			if ( uploadView.uploader && uploadView.uploader.ready ) {
+				this.addFiles.apply( this );
+			} else {
+				this.workflow.on( 'uploader:ready', this.addFiles, this );
 			}
-		})
-			.done( this.renderoEmbed )
-			.fail( this.renderFail );
+		} else {
+			this.workflow.state().reset();
+			this.addFiles.apply( this );
+			this.workflow.open();
+		}
+
+		return false;
 	},
 
-	renderFail: function ( response, status ) {
-		if ( 'abort' === status ) {
-			return;
+	/**
+	 * Add the files to the uploader.
+	 */
+	addFiles: function() {
+		if ( this.files.length ) {
+			this.workflow.uploader.uploader.uploader.addFile( _.toArray( this.files ) );
+			this.files = [];
 		}
-		this.$( '.link-text' ).show();
+		return this;
 	},
 
-	renderoEmbed: function( response ) {
-		var html = ( response && response.data && response.data.body ) || '';
-
-		if ( html ) {
-			this.$('.embed-container').show().find('.embed-preview').html( html );
-		} else {
-			this.renderFail();
+	containerDragover: function( event ) {
+		if ( this.localDrag || ! this.isDraggingFile( event ) ) {
+			return;
 		}
-	}
-});
 
-module.exports = EmbedLink;
+		this.overContainer = true;
+		this.refresh();
+	},
 
+	containerDragleave: function() {
+		this.overContainer = false;
 
-/***/ }),
-/* 94 */
-/***/ (function(module, exports) {
+		// Throttle dragleave because it's called when bouncing from some elements to others.
+		_.delay( _.bind( this.refresh, this ), 50 );
+	},
 
-/**
- * wp.media.view.EmbedImage
- *
- * @class
- * @augments wp.media.view.Settings.AttachmentDisplay
- * @augments wp.media.view.Settings
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var AttachmentDisplay = wp.media.view.Settings.AttachmentDisplay,
-	EmbedImage;
+	dropzoneDragover: function( event ) {
+		if ( this.localDrag || ! this.isDraggingFile( event ) ) {
+			return;
+		}
 
-EmbedImage = AttachmentDisplay.extend({
-	className: 'embed-media-settings',
-	template:  wp.template('embed-image-settings'),
+		this.overDropzone = true;
+		this.refresh( event );
+		return false;
+	},
 
-	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 );
+	dropzoneDragleave: function( e ) {
+		this.overDropzone = false;
+		_.delay( _.bind( this.refresh, this, e ), 50 );
 	},
 
-	updateImage: function() {
-		this.$('img').attr( 'src', this.model.get('url') );
+	click: function( e ) {
+		// In the rare case where the dropzone gets stuck, hide it on click.
+		this.containerDragleave( e );
+		this.dropzoneDragleave( e );
+		this.localDrag = false;
 	}
 });
 
-module.exports = EmbedImage;
-
-
-/***/ }),
-/* 95 */
-/***/ (function(module, exports) {
+module.exports = EditorUploader;
 
+},{}],71:[function(require,module,exports){
 /**
- * wp.media.view.ImageDetails
+ * wp.media.view.UploaderInline
+ *
+ * The inline uploader that shows up in the 'Upload Files' tab.
  *
  * @class
- * @augments wp.media.view.Settings.AttachmentDisplay
- * @augments wp.media.view.Settings
  * @augments wp.media.View
  * @augments wp.Backbone.View
  * @augments Backbone.View
  */
-var AttachmentDisplay = wp.media.view.Settings.AttachmentDisplay,
-	$ = jQuery,
-	ImageDetails;
+var View = wp.media.View,
+	UploaderInline;
 
-ImageDetails = AttachmentDisplay.extend({
-	className: 'image-details',
-	template:  wp.template('image-details'),
-	events: _.defaults( AttachmentDisplay.prototype.events, {
-		'click .edit-attachment': 'editAttachment',
-		'click .replace-attachment': 'replaceAttachment',
-		'click .advanced-toggle': 'onToggleAdvanced',
-		'change [data-setting="customWidth"]': 'onCustomSize',
-		'change [data-setting="customHeight"]': 'onCustomSize',
-		'keyup [data-setting="customWidth"]': 'onCustomSize',
-		'keyup [data-setting="customHeight"]': 'onCustomSize'
-	} ),
-	initialize: function() {
-		// used in AttachmentDisplay.prototype.updateLinkTo
-		this.options.attachment = this.model.attachment;
-		this.listenTo( this.model, 'change:url', this.updateUrl );
-		this.listenTo( this.model, 'change:link', this.toggleLinkSettings );
-		this.listenTo( this.model, 'change:size', this.toggleCustomSize );
+UploaderInline = View.extend({
+	tagName:   'div',
+	className: 'uploader-inline',
+	template:  wp.template('uploader-inline'),
 
-		AttachmentDisplay.prototype.initialize.apply( this, arguments );
+	events: {
+		'click .close': 'hide'
 	},
 
-	prepare: function() {
-		var attachment = false;
+	initialize: function() {
+		_.defaults( this.options, {
+			message: '',
+			status:  true,
+			canClose: false
+		});
 
-		if ( this.model.attachment ) {
-			attachment = this.model.attachment.toJSON();
+		if ( ! this.options.$browser && this.controller.uploader ) {
+			this.options.$browser = this.controller.uploader.$browser;
 		}
-		return _.defaults({
-			model: this.model.toJSON(),
-			attachment: attachment
-		}, this.options );
-	},
 
-	render: function() {
-		var args = arguments;
-
-		if ( this.model.attachment && 'pending' === this.model.dfd.state() ) {
-			this.model.dfd
-				.done( _.bind( function() {
-					AttachmentDisplay.prototype.render.apply( this, args );
-					this.postRender();
-				}, this ) )
-				.fail( _.bind( function() {
-					this.model.attachment = false;
-					AttachmentDisplay.prototype.render.apply( this, args );
-					this.postRender();
-				}, this ) );
-		} else {
-			AttachmentDisplay.prototype.render.apply( this, arguments );
-			this.postRender();
+		if ( _.isUndefined( this.options.postId ) ) {
+			this.options.postId = wp.media.view.settings.post.id;
 		}
 
-		return this;
-	},
-
-	postRender: function() {
-		setTimeout( _.bind( this.resetFocus, this ), 10 );
-		this.toggleLinkSettings();
-		if ( window.getUserSetting( 'advImgDetails' ) === 'show' ) {
-			this.toggleAdvanced( true );
+		if ( this.options.status ) {
+			this.views.set( '.upload-inline-status', new wp.media.view.UploaderStatus({
+				controller: this.controller
+			}) );
 		}
-		this.trigger( 'post-render' );
 	},
 
-	resetFocus: function() {
-		this.$( '.link-to-custom' ).blur();
-		this.$( '.embed-media-settings' ).scrollTop( 0 );
-	},
+	prepare: function() {
+		var suggestedWidth = this.controller.state().get('suggestedWidth'),
+			suggestedHeight = this.controller.state().get('suggestedHeight'),
+			data = {};
 
-	updateUrl: function() {
-		this.$( '.image img' ).attr( 'src', this.model.get( 'url' ) );
-		this.$( '.url' ).val( this.model.get( 'url' ) );
-	},
+		data.message = this.options.message;
+		data.canClose = this.options.canClose;
 
-	toggleLinkSettings: function() {
-		if ( this.model.get( 'link' ) === 'none' ) {
-			this.$( '.link-settings' ).addClass('hidden');
-		} else {
-			this.$( '.link-settings' ).removeClass('hidden');
+		if ( suggestedWidth && suggestedHeight ) {
+			data.suggestedWidth = suggestedWidth;
+			data.suggestedHeight = suggestedHeight;
 		}
-	},
 
-	toggleCustomSize: function() {
-		if ( this.model.get( 'size' ) !== 'custom' ) {
-			this.$( '.custom-size' ).addClass('hidden');
-		} else {
-			this.$( '.custom-size' ).removeClass('hidden');
-		}
+		return data;
 	},
-
-	onCustomSize: function( event ) {
-		var dimension = $( event.target ).data('setting'),
-			num = $( event.target ).val(),
-			value;
-
-		// Ignore bogus input
-		if ( ! /^\d+/.test( num ) || parseInt( num, 10 ) < 1 ) {
-			event.preventDefault();
-			return;
+	/**
+	 * @returns {wp.media.view.UploaderInline} Returns itself to allow chaining
+	 */
+	dispose: function() {
+		if ( this.disposing ) {
+			/**
+			 * call 'dispose' directly on the parent class
+			 */
+			return View.prototype.dispose.apply( this, arguments );
 		}
 
-		if ( dimension === 'customWidth' ) {
-			value = Math.round( 1 / this.model.get( 'aspectRatio' ) * num );
-			this.model.set( 'customHeight', value, { silent: true } );
-			this.$( '[data-setting="customHeight"]' ).val( value );
-		} else {
-			value = Math.round( this.model.get( 'aspectRatio' ) * num );
-			this.model.set( 'customWidth', value, { silent: true  } );
-			this.$( '[data-setting="customWidth"]' ).val( value );
-		}
+		// Run remove on `dispose`, so we can be sure to refresh the
+		// uploader with a view-less DOM. Track whether we're disposing
+		// so we don't trigger an infinite loop.
+		this.disposing = true;
+		return this.remove();
 	},
+	/**
+	 * @returns {wp.media.view.UploaderInline} Returns itself to allow chaining
+	 */
+	remove: function() {
+		/**
+		 * call 'remove' directly on the parent class
+		 */
+		var result = View.prototype.remove.apply( this, arguments );
 
-	onToggleAdvanced: function( event ) {
-		event.preventDefault();
-		this.toggleAdvanced();
+		_.defer( _.bind( this.refresh, this ) );
+		return result;
 	},
 
-	toggleAdvanced: function( show ) {
-		var $advanced = this.$el.find( '.advanced-section' ),
-			mode;
+	refresh: function() {
+		var uploader = this.controller.uploader;
 
-		if ( $advanced.hasClass('advanced-visible') || show === false ) {
-			$advanced.removeClass('advanced-visible');
-			$advanced.find('.advanced-settings').addClass('hidden');
-			mode = 'hide';
-		} else {
-			$advanced.addClass('advanced-visible');
-			$advanced.find('.advanced-settings').removeClass('hidden');
-			mode = 'show';
+		if ( uploader ) {
+			uploader.refresh();
 		}
-
-		window.setUserSetting( 'advImgDetails', mode );
 	},
+	/**
+	 * @returns {wp.media.view.UploaderInline}
+	 */
+	ready: function() {
+		var $browser = this.options.$browser,
+			$placeholder;
 
-	editAttachment: function( event ) {
-		var editState = this.controller.states.get( 'edit-image' );
+		if ( this.controller.uploader ) {
+			$placeholder = this.$('.browser');
 
-		if ( window.imageEdit && editState ) {
-			event.preventDefault();
-			editState.set( 'image', this.model.attachment );
-			this.controller.setState( 'edit-image' );
+			// Check if we've already replaced the placeholder.
+			if ( $placeholder[0] === $browser[0] ) {
+				return;
+			}
+
+			$browser.detach().text( $placeholder.text() );
+			$browser[0].className = $placeholder[0].className;
+			$placeholder.replaceWith( $browser.show() );
 		}
-	},
 
-	replaceAttachment: function( event ) {
-		event.preventDefault();
-		this.controller.setState( 'replace-image' );
+		this.refresh();
+		return this;
+	},
+	show: function() {
+		this.$el.removeClass( 'hidden' );
+	},
+	hide: function() {
+		this.$el.addClass( 'hidden' );
 	}
+
 });
 
-module.exports = ImageDetails;
+module.exports = UploaderInline;
 
+},{}],72:[function(require,module,exports){
+/**
+ * wp.media.view.UploaderStatusError
+ *
+ * @class
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+var UploaderStatusError = wp.media.View.extend({
+	className: 'upload-error',
+	template:  wp.template('uploader-status-error')
+});
 
-/***/ }),
-/* 96 */
-/***/ (function(module, exports) {
+module.exports = UploaderStatusError;
 
+},{}],73:[function(require,module,exports){
 /**
- * wp.media.view.Cropper
- *
- * Uses the imgAreaSelect plugin to allow a user to crop an image.
+ * wp.media.view.UploaderStatus
  *
- * Takes imgAreaSelect options from
- * wp.customize.HeaderControl.calculateImageSelectOptions via
- * wp.customize.HeaderControl.openMM.
+ * An uploader status for on-going uploads.
  *
  * @class
  * @augments wp.media.View
@@ -8618,263 +8208,307 @@ module.exports = ImageDetails;
  * @augments Backbone.View
  */
 var View = wp.media.View,
-	UploaderStatus = wp.media.view.UploaderStatus,
-	l10n = wp.media.view.l10n,
-	$ = jQuery,
-	Cropper;
+	UploaderStatus;
 
-Cropper = View.extend({
-	className: 'crop-content',
-	template: wp.template('crop-content'),
-	initialize: function() {
-		_.bindAll(this, 'onImageLoad');
+UploaderStatus = View.extend({
+	className: 'media-uploader-status',
+	template:  wp.template('uploader-status'),
+
+	events: {
+		'click .upload-dismiss-errors': 'dismiss'
 	},
-	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));
+
+	initialize: function() {
+		this.queue = wp.Uploader.queue;
+		this.queue.on( 'add remove reset', this.visibility, this );
+		this.queue.on( 'add remove reset change:percent', this.progress, this );
+		this.queue.on( 'add remove reset change:uploading', this.info, this );
+
+		this.errors = wp.Uploader.errors;
+		this.errors.reset();
+		this.errors.on( 'add remove reset', this.visibility, this );
+		this.errors.on( 'add', this.error, this );
 	},
-	remove: function() {
-		$(window).off('resize.cropper');
-		this.$el.remove();
-		this.$el.off();
-		View.prototype.remove.apply(this, arguments);
+	/**
+	 * @global wp.Uploader
+	 * @returns {wp.media.view.UploaderStatus}
+	 */
+	dispose: function() {
+		wp.Uploader.queue.off( null, null, this );
+		/**
+		 * call 'dispose' directly on the parent class
+		 */
+		View.prototype.dispose.apply( this, arguments );
+		return this;
 	},
-	prepare: function() {
-		return {
-			title: l10n.cropYourImage,
-			url: this.options.attachment.get('url')
-		};
+
+	visibility: function() {
+		this.$el.toggleClass( 'uploading', !! this.queue.length );
+		this.$el.toggleClass( 'errors', !! this.errors.length );
+		this.$el.toggle( !! this.queue.length || !! this.errors.length );
 	},
-	onImageLoad: function() {
-		var imgOptions = this.controller.get('imgSelectOptions');
-		if (typeof imgOptions === 'function') {
-			imgOptions = imgOptions(this.options.attachment, this.controller);
-		}
 
-		imgOptions = _.extend(imgOptions, {parent: this.$el});
-		this.trigger('image-loaded');
-		this.controller.imgSelect = this.$image.imgAreaSelect(imgOptions);
+	ready: function() {
+		_.each({
+			'$bar':      '.media-progress-bar div',
+			'$index':    '.upload-index',
+			'$total':    '.upload-total',
+			'$filename': '.upload-filename'
+		}, function( selector, key ) {
+			this[ key ] = this.$( selector );
+		}, this );
+
+		this.visibility();
+		this.progress();
+		this.info();
 	},
-	onError: function() {
-		var filename = this.options.attachment.get('filename');
 
-		this.views.add( '.upload-errors', new wp.media.view.UploaderStatusError({
-			filename: UploaderStatus.prototype.filename(filename),
-			message: window._wpMediaViewsL10n.cropError
-		}), { at: 0 });
-	}
-});
+	progress: function() {
+		var queue = this.queue,
+			$bar = this.$bar;
 
-module.exports = Cropper;
+		if ( ! $bar || ! queue.length ) {
+			return;
+		}
 
+		$bar.width( ( queue.reduce( function( memo, attachment ) {
+			if ( ! attachment.get('uploading') ) {
+				return memo + 100;
+			}
 
-/***/ }),
-/* 97 */
-/***/ (function(module, exports) {
+			var percent = attachment.get('percent');
+			return memo + ( _.isNumber( percent ) ? percent : 100 );
+		}, 0 ) / queue.length ) + '%' );
+	},
 
-/**
- * wp.media.view.SiteIconCropper
- *
- * Uses the imgAreaSelect plugin to allow a user to crop a Site Icon.
- *
- * Takes imgAreaSelect options from
- * wp.customize.SiteIconControl.calculateImageSelectOptions.
- *
- * @class
- * @augments wp.media.view.Cropper
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var View = wp.media.view,
-	SiteIconCropper;
+	info: function() {
+		var queue = this.queue,
+			index = 0, active;
 
-SiteIconCropper = View.Cropper.extend({
-	className: 'crop-content site-icon',
+		if ( ! queue.length ) {
+			return;
+		}
 
-	ready: function () {
-		View.Cropper.prototype.ready.apply( this, arguments );
+		active = this.queue.find( function( attachment, i ) {
+			index = i;
+			return attachment.get('uploading');
+		});
 
-		this.$( '.crop-image' ).on( 'load', _.bind( this.addSidebar, this ) );
+		this.$index.text( index + 1 );
+		this.$total.text( queue.length );
+		this.$filename.html( active ? this.filename( active.get('filename') ) : '' );
+	},
+	/**
+	 * @param {string} filename
+	 * @returns {string}
+	 */
+	filename: function( filename ) {
+		return _.escape( filename );
+	},
+	/**
+	 * @param {Backbone.Model} error
+	 */
+	error: function( error ) {
+		this.views.add( '.upload-errors', new wp.media.view.UploaderStatusError({
+			filename: this.filename( error.get('file').name ),
+			message:  error.get('message')
+		}), { at: 0 });
 	},
 
-	addSidebar: function() {
-		this.sidebar = new wp.media.view.Sidebar({
-			controller: this.controller
-		});
+	/**
+	 * @global wp.Uploader
+	 *
+	 * @param {Object} event
+	 */
+	dismiss: function( event ) {
+		var errors = this.views.get('.upload-errors');
 
-		this.sidebar.set( 'preview', new wp.media.view.SiteIconPreview({
-			controller: this.controller,
-			attachment: this.options.attachment
-		}) );
+		event.preventDefault();
 
-		this.controller.cropperView.views.add( this.sidebar );
+		if ( errors ) {
+			_.invoke( errors, 'remove' );
+		}
+		wp.Uploader.errors.reset();
 	}
 });
 
-module.exports = SiteIconCropper;
-
-
-/***/ }),
-/* 98 */
-/***/ (function(module, exports) {
+module.exports = UploaderStatus;
 
+},{}],74:[function(require,module,exports){
 /**
- * wp.media.view.SiteIconPreview
+ * wp.media.view.UploaderWindow
  *
- * Shows a preview of the Site Icon as a favicon and app icon while cropping.
+ * An uploader window that allows for dragging and dropping media.
  *
  * @class
  * @augments wp.media.View
  * @augments wp.Backbone.View
  * @augments Backbone.View
+ *
+ * @param {object} [options]                   Options hash passed to the view.
+ * @param {object} [options.uploader]          Uploader properties.
+ * @param {jQuery} [options.uploader.browser]
+ * @param {jQuery} [options.uploader.dropzone] jQuery collection of the dropzone.
+ * @param {object} [options.uploader.params]
  */
-var View = wp.media.View,
-	$ = jQuery,
-	SiteIconPreview;
-
-SiteIconPreview = View.extend({
-	className: 'site-icon-preview',
-	template: wp.template( 'site-icon-preview' ),
+var $ = jQuery,
+	UploaderWindow;
 
-	ready: function() {
-		this.controller.imgSelect.setOptions({
-			onInit: this.updatePreview,
-			onSelectChange: this.updatePreview
-		});
-	},
+UploaderWindow = wp.media.View.extend({
+	tagName:   'div',
+	className: 'uploader-window',
+	template:  wp.template('uploader-window'),
 
-	prepare: function() {
-		return {
-			url: this.options.attachment.get( 'url' )
-		};
-	},
+	initialize: function() {
+		var uploader;
 
-	updatePreview: function( img, coords ) {
-		var rx = 64 / coords.width,
-			ry = 64 / coords.height,
-			preview_rx = 16 / coords.width,
-			preview_ry = 16 / coords.height;
+		this.$browser = $('<a href="#" class="browser" />').hide().appendTo('body');
 
-		$( '#preview-app-icon' ).css({
-			width: Math.round(rx * this.imageWidth ) + 'px',
-			height: Math.round(ry * this.imageHeight ) + 'px',
-			marginLeft: '-' + Math.round(rx * coords.x1) + 'px',
-			marginTop: '-' + Math.round(ry * coords.y1) + 'px'
+		uploader = this.options.uploader = _.defaults( this.options.uploader || {}, {
+			dropzone:  this.$el,
+			browser:   this.$browser,
+			params:    {}
 		});
 
-		$( '#preview-favicon' ).css({
-			width: Math.round( preview_rx * this.imageWidth ) + 'px',
-			height: Math.round( preview_ry * this.imageHeight ) + 'px',
-			marginLeft: '-' + Math.round( preview_rx * coords.x1 ) + 'px',
-			marginTop: '-' + Math.floor( preview_ry* coords.y1 ) + 'px'
-		});
-	}
-});
+		// Ensure the dropzone is a jQuery collection.
+		if ( uploader.dropzone && ! (uploader.dropzone instanceof $) ) {
+			uploader.dropzone = $( uploader.dropzone );
+		}
 
-module.exports = SiteIconPreview;
+		this.controller.on( 'activate', this.refresh, this );
 
+		this.controller.on( 'detach', function() {
+			this.$browser.remove();
+		}, this );
+	},
 
-/***/ }),
-/* 99 */
-/***/ (function(module, exports) {
+	refresh: function() {
+		if ( this.uploader ) {
+			this.uploader.refresh();
+		}
+	},
 
-/**
- * wp.media.view.EditImage
- *
- * @class
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
-var View = wp.media.View,
-	EditImage;
+	ready: function() {
+		var postId = wp.media.view.settings.post.id,
+			dropzone;
 
-EditImage = View.extend({
-	className: 'image-editor',
-	template: wp.template('image-editor'),
+		// If the uploader already exists, bail.
+		if ( this.uploader ) {
+			return;
+		}
 
-	initialize: function( options ) {
-		this.editor = window.imageEdit;
-		this.controller = options.controller;
-		View.prototype.initialize.apply( this, arguments );
-	},
+		if ( postId ) {
+			this.options.uploader.params.post_id = postId;
+		}
+		this.uploader = new wp.Uploader( this.options.uploader );
 
-	prepare: function() {
-		return this.model.toJSON();
-	},
+		dropzone = this.uploader.dropzone;
+		dropzone.on( 'dropzone:enter', _.bind( this.show, this ) );
+		dropzone.on( 'dropzone:leave', _.bind( this.hide, this ) );
 
-	loadEditor: function() {
-		var dfd = this.editor.open( this.model.get('id'), this.model.get('nonces').edit, this );
-		dfd.done( _.bind( this.focus, this ) );
+		$( this.uploader ).on( 'uploader:ready', _.bind( this._ready, this ) );
 	},
 
-	focus: function() {
-		this.$( '.imgedit-submit .button' ).eq( 0 ).focus();
+	_ready: function() {
+		this.controller.trigger( 'uploader:ready' );
 	},
 
-	back: function() {
-		var lastState = this.controller.lastState();
-		this.controller.setState( lastState );
-	},
+	show: function() {
+		var $el = this.$el.show();
 
-	refresh: function() {
-		this.model.fetch();
+		// Ensure that the animation is triggered by waiting until
+		// the transparent element is painted into the DOM.
+		_.defer( function() {
+			$el.css({ opacity: 1 });
+		});
 	},
 
-	save: function() {
-		var lastState = this.controller.lastState();
+	hide: function() {
+		var $el = this.$el.css({ opacity: 0 });
 
-		this.model.fetch().done( _.bind( function() {
-			this.controller.setState( lastState );
-		}, this ) );
-	}
+		wp.media.transition( $el ).done( function() {
+			// Transition end events are subject to race conditions.
+			// Make sure that the value is set as intended.
+			if ( '0' === $el.css('opacity') ) {
+				$el.hide();
+			}
+		});
 
+		// https://core.trac.wordpress.org/ticket/27341
+		_.delay( function() {
+			if ( '0' === $el.css('opacity') && $el.is(':visible') ) {
+				$el.hide();
+			}
+		}, 500 );
+	}
 });
 
-module.exports = EditImage;
-
-
-/***/ }),
-/* 100 */
-/***/ (function(module, exports) {
+module.exports = UploaderWindow;
 
+},{}],75:[function(require,module,exports){
 /**
- * wp.media.view.Spinner
+ * wp.media.View
+ *
+ * The base view class for media.
+ *
+ * Undelegating events, removing events from the model, and
+ * removing events from the controller mirror the code for
+ * `Backbone.View.dispose` in Backbone 0.9.8 development.
+ *
+ * This behavior has since been removed, and should not be used
+ * outside of the media manager.
  *
  * @class
- * @augments wp.media.View
  * @augments wp.Backbone.View
  * @augments Backbone.View
  */
-var Spinner = wp.media.View.extend({
-	tagName:   'span',
-	className: 'spinner',
-	spinnerTimeout: false,
-	delay: 400,
+var View = wp.Backbone.View.extend({
+	constructor: function( options ) {
+		if ( options && options.controller ) {
+			this.controller = options.controller;
+		}
+		wp.Backbone.View.apply( this, arguments );
+	},
+	/**
+	 * @todo The internal comment mentions this might have been a stop-gap
+	 *       before Backbone 0.9.8 came out. Figure out if Backbone core takes
+	 *       care of this in Backbone.View now.
+	 *
+	 * @returns {wp.media.View} Returns itself to allow chaining
+	 */
+	dispose: function() {
+		// Undelegating events, removing events from the model, and
+		// removing events from the controller mirror the code for
+		// `Backbone.View.dispose` in Backbone 0.9.8 development.
+		this.undelegateEvents();
 
-	show: function() {
-		if ( ! this.spinnerTimeout ) {
-			this.spinnerTimeout = _.delay(function( $el ) {
-				$el.addClass( 'is-active' );
-			}, this.delay, this.$el );
+		if ( this.model && this.model.off ) {
+			this.model.off( null, null, this );
 		}
 
-		return this;
-	},
+		if ( this.collection && this.collection.off ) {
+			this.collection.off( null, null, this );
+		}
 
-	hide: function() {
-		this.$el.removeClass( 'is-active' );
-		this.spinnerTimeout = clearTimeout( this.spinnerTimeout );
+		// Unbind controller events.
+		if ( this.controller && this.controller.off ) {
+			this.controller.off( null, null, this );
+		}
 
 		return this;
+	},
+	/**
+	 * @returns {wp.media.View} Returns itself to allow chaining
+	 */
+	remove: function() {
+		this.dispose();
+		/**
+		 * call 'remove' directly on the parent class
+		 */
+		return wp.Backbone.View.prototype.remove.apply( this, arguments );
 	}
 });
 
-module.exports = Spinner;
-
+module.exports = View;
 
-/***/ })
-/******/ ]));
\ No newline at end of file
+},{}]},{},[19]);