<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[31935] trunk/src/wp-includes/js/media: Let us pray to the gods of backwards compatibility:</title>
</head>
<body>

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

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Let us pray to the gods of backwards compatibility:

* The way that the JS modules for media are currently set up turns the existing global `wp.media` namespace into a read-only API, this is bad.
* For the existing module implementation to work with plugins, those looking to override or extend a class would have to modify their own plugin to use `browserify` - we can't expect this to happen
* Because the general way that plugins override media classes is via machete (resetting them to something else), we cannot use `require( 'module' )` in the internal code for media modules

We CAN continue to use `require( 'fun/js' )` in the manifests for media. 

Future code/projects should carefully consider what is made to be public API. In 3.5, EVERYTHING was made public, so everything shall remain public.

See <a href="https://core.trac.wordpress.org/ticket/31684">#31684</a>, <a href="https://core.trac.wordpress.org/ticket/28510">#28510</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmediaaudiovideojs">trunk/src/wp-includes/js/media/audio-video.js</a></li>
<li><a href="#trunksrcwpincludesjsmediacontrollerscollectionaddjs">trunk/src/wp-includes/js/media/controllers/collection-add.js</a></li>
<li><a href="#trunksrcwpincludesjsmediacontrollerscollectioneditjs">trunk/src/wp-includes/js/media/controllers/collection-edit.js</a></li>
<li><a href="#trunksrcwpincludesjsmediacontrollerscropperjs">trunk/src/wp-includes/js/media/controllers/cropper.js</a></li>
<li><a href="#trunksrcwpincludesjsmediacontrollerseditattachmentmetadatajs">trunk/src/wp-includes/js/media/controllers/edit-attachment-metadata.js</a></li>
<li><a href="#trunksrcwpincludesjsmediacontrollerseditimagejs">trunk/src/wp-includes/js/media/controllers/edit-image.js</a></li>
<li><a href="#trunksrcwpincludesjsmediacontrollersembedjs">trunk/src/wp-includes/js/media/controllers/embed.js</a></li>
<li><a href="#trunksrcwpincludesjsmediacontrollersfeaturedimagejs">trunk/src/wp-includes/js/media/controllers/featured-image.js</a></li>
<li><a href="#trunksrcwpincludesjsmediacontrollersgalleryaddjs">trunk/src/wp-includes/js/media/controllers/gallery-add.js</a></li>
<li><a href="#trunksrcwpincludesjsmediacontrollersgalleryeditjs">trunk/src/wp-includes/js/media/controllers/gallery-edit.js</a></li>
<li><a href="#trunksrcwpincludesjsmediacontrollersimagedetailsjs">trunk/src/wp-includes/js/media/controllers/image-details.js</a></li>
<li><a href="#trunksrcwpincludesjsmediacontrollerslibraryjs">trunk/src/wp-includes/js/media/controllers/library.js</a></li>
<li><a href="#trunksrcwpincludesjsmediacontrollersmedialibraryjs">trunk/src/wp-includes/js/media/controllers/media-library.js</a></li>
<li><a href="#trunksrcwpincludesjsmediacontrollersreplaceimagejs">trunk/src/wp-includes/js/media/controllers/replace-image.js</a></li>
<li><a href="#trunksrcwpincludesjsmediagridjs">trunk/src/wp-includes/js/media/grid.js</a></li>
<li><a href="#trunksrcwpincludesjsmediamodelsattachmentjs">trunk/src/wp-includes/js/media/models/attachment.js</a></li>
<li><a href="#trunksrcwpincludesjsmediamodelsattachmentsjs">trunk/src/wp-includes/js/media/models/attachments.js</a></li>
<li><a href="#trunksrcwpincludesjsmediamodelspostimagejs">trunk/src/wp-includes/js/media/models/post-image.js</a></li>
<li><a href="#trunksrcwpincludesjsmediamodelsqueryjs">trunk/src/wp-includes/js/media/models/query.js</a></li>
<li><a href="#trunksrcwpincludesjsmediamodelsselectionjs">trunk/src/wp-includes/js/media/models/selection.js</a></li>
<li><a href="#trunksrcwpincludesjsmediamodelsjs">trunk/src/wp-includes/js/media/models.js</a></li>
<li><a href="#trunksrcwpincludesjsmediamodelsmanifestjs">trunk/src/wp-includes/js/media/models.manifest.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsattachmentdetailsjs">trunk/src/wp-includes/js/media/views/attachment/details.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsattachmenteditlibraryjs">trunk/src/wp-includes/js/media/views/attachment/edit-library.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsattachmenteditselectionjs">trunk/src/wp-includes/js/media/views/attachment/edit-selection.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsattachmentlibraryjs">trunk/src/wp-includes/js/media/views/attachment/library.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsattachmentselectionjs">trunk/src/wp-includes/js/media/views/attachment/selection.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsattachmentcompatjs">trunk/src/wp-includes/js/media/views/attachment-compat.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsattachmentfiltersalljs">trunk/src/wp-includes/js/media/views/attachment-filters/all.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsattachmentfiltersdatejs">trunk/src/wp-includes/js/media/views/attachment-filters/date.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsattachmentfiltersuploadedjs">trunk/src/wp-includes/js/media/views/attachment-filters/uploaded.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsattachmentfiltersjs">trunk/src/wp-includes/js/media/views/attachment-filters.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsattachmentjs">trunk/src/wp-includes/js/media/views/attachment.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsattachmentsbrowserjs">trunk/src/wp-includes/js/media/views/attachments/browser.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsattachmentsselectionjs">trunk/src/wp-includes/js/media/views/attachments/selection.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsattachmentsjs">trunk/src/wp-includes/js/media/views/attachments.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsaudiodetailsjs">trunk/src/wp-includes/js/media/views/audio-details.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsbuttondeleteselectedpermanentlyjs">trunk/src/wp-includes/js/media/views/button/delete-selected-permanently.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsbuttongroupjs">trunk/src/wp-includes/js/media/views/button-group.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsbuttonjs">trunk/src/wp-includes/js/media/views/button.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewscropperjs">trunk/src/wp-includes/js/media/views/cropper.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewseditimagejs">trunk/src/wp-includes/js/media/views/edit-image.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsembedimagejs">trunk/src/wp-includes/js/media/views/embed/image.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsembedlinkjs">trunk/src/wp-includes/js/media/views/embed/link.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsembedurljs">trunk/src/wp-includes/js/media/views/embed/url.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsembedjs">trunk/src/wp-includes/js/media/views/embed.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsfocusmanagerjs">trunk/src/wp-includes/js/media/views/focus-manager.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsframeaudiodetailsjs">trunk/src/wp-includes/js/media/views/frame/audio-details.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsframeeditattachmentsjs">trunk/src/wp-includes/js/media/views/frame/edit-attachments.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsframeimagedetailsjs">trunk/src/wp-includes/js/media/views/frame/image-details.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsframemanagejs">trunk/src/wp-includes/js/media/views/frame/manage.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsframemediadetailsjs">trunk/src/wp-includes/js/media/views/frame/media-details.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsframepostjs">trunk/src/wp-includes/js/media/views/frame/post.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsframeselectjs">trunk/src/wp-includes/js/media/views/frame/select.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsframevideodetailsjs">trunk/src/wp-includes/js/media/views/frame/video-details.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsframejs">trunk/src/wp-includes/js/media/views/frame.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsiframejs">trunk/src/wp-includes/js/media/views/iframe.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsimagedetailsjs">trunk/src/wp-includes/js/media/views/image-details.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewslabeljs">trunk/src/wp-includes/js/media/views/label.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsmediaframejs">trunk/src/wp-includes/js/media/views/media-frame.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsmenuitemjs">trunk/src/wp-includes/js/media/views/menu-item.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsmenujs">trunk/src/wp-includes/js/media/views/menu.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsmodaljs">trunk/src/wp-includes/js/media/views/modal.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsprioritylistjs">trunk/src/wp-includes/js/media/views/priority-list.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsrouteritemjs">trunk/src/wp-includes/js/media/views/router-item.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsrouterjs">trunk/src/wp-includes/js/media/views/router.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewssearchjs">trunk/src/wp-includes/js/media/views/search.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsselectionjs">trunk/src/wp-includes/js/media/views/selection.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewssettingsattachmentdisplayjs">trunk/src/wp-includes/js/media/views/settings/attachment-display.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewssettingsgalleryjs">trunk/src/wp-includes/js/media/views/settings/gallery.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewssettingsplaylistjs">trunk/src/wp-includes/js/media/views/settings/playlist.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewssettingsjs">trunk/src/wp-includes/js/media/views/settings.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewssidebarjs">trunk/src/wp-includes/js/media/views/sidebar.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsspinnerjs">trunk/src/wp-includes/js/media/views/spinner.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewstoolbarembedjs">trunk/src/wp-includes/js/media/views/toolbar/embed.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewstoolbarselectjs">trunk/src/wp-includes/js/media/views/toolbar/select.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewstoolbarjs">trunk/src/wp-includes/js/media/views/toolbar.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsuploadereditorjs">trunk/src/wp-includes/js/media/views/uploader/editor.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsuploaderinlinejs">trunk/src/wp-includes/js/media/views/uploader/inline.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsuploaderstatuserrorjs">trunk/src/wp-includes/js/media/views/uploader/status-error.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsuploaderstatusjs">trunk/src/wp-includes/js/media/views/uploader/status.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsuploaderwindowjs">trunk/src/wp-includes/js/media/views/uploader/window.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsvideodetailsjs">trunk/src/wp-includes/js/media/views/video-details.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media/views.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjsmediaaudiovideojs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/audio-video.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/audio-video.js     2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/audio-video.js       2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -345,7 +345,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var MediaDetails = require( './media-details' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var MediaDetails = wp.media.view.MediaDetails,
</ins><span class="cx" style="display: block; padding: 0 10px">         AudioDetails;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> AudioDetails = MediaDetails.extend({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -371,7 +371,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = AudioDetails;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./media-details":9}],6:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],6:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -389,9 +389,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> var MediaDetails = wp.media.view.MediaFrame.MediaDetails,
</span><span class="cx" style="display: block; padding: 0 10px">        MediaLibrary = wp.media.controller.MediaLibrary,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        
-       AudioDetailsView = require( '../audio-details.js' ),
-       AudioDetailsController = require( '../../controllers/audio-details.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        AudioDetails;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -408,7 +406,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        initialize: function( options ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                options.DetailsView = AudioDetailsView;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         options.DetailsView = wp.media.view.AudioDetails;
</ins><span class="cx" style="display: block; padding: 0 10px">                 options.cancelText = l10n.audioDetailsCancel;
</span><span class="cx" style="display: block; padding: 0 10px">                options.addText = l10n.audioAddSourceTitle;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -424,7 +422,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        createStates: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                this.states.add([
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new AudioDetailsController( {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.AudioDetails( {
</ins><span class="cx" style="display: block; padding: 0 10px">                                 media: this.media
</span><span class="cx" style="display: block; padding: 0 10px">                        } ),
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,7 +449,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = AudioDetails;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"../../controllers/audio-details.js":2,"../audio-details.js":5}],7:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],7:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -466,9 +464,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @mixes wp.media.controller.StateMachine
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = wp.media.View,
-       Toolbar = wp.media.view.Toolbar,
-       Select = wp.media.view.MediaFrame.Select,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Select = wp.media.view.MediaFrame.Select,
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        MediaDetails;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -531,7 +527,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        }
</span><span class="cx" style="display: block; padding: 0 10px">                                }
</span><span class="cx" style="display: block; padding: 0 10px">                        },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        separateCancel: new View({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 separateCancel: new wp.media.View({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 className: 'separator',
</span><span class="cx" style="display: block; padding: 0 10px">                                priority: 40
</span><span class="cx" style="display: block; padding: 0 10px">                        })
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -540,7 +536,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        setPrimaryButton: function(text, handler) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.toolbar.set( new Toolbar({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.toolbar.set( new wp.media.view.Toolbar({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        items: {
</span><span class="cx" style="display: block; padding: 0 10px">                                button: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -603,8 +599,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> var MediaDetails = wp.media.view.MediaFrame.MediaDetails,
</span><span class="cx" style="display: block; padding: 0 10px">        MediaLibrary = wp.media.controller.MediaLibrary,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        VideoDetailsView = require( '../video-details.js' ),
-       VideoDetailsController = require( '../../controllers/video-details.js' ),
</del><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        VideoDetails;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -621,7 +615,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        initialize: function( options ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                options.DetailsView = VideoDetailsView;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         options.DetailsView = wp.media.view.VideoDetails;
</ins><span class="cx" style="display: block; padding: 0 10px">                 options.cancelText = l10n.videoDetailsCancel;
</span><span class="cx" style="display: block; padding: 0 10px">                options.addText = l10n.videoAddSourceTitle;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -639,7 +633,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        createStates: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                this.states.add([
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new VideoDetailsController({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.VideoDetails({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 media: this.media
</span><span class="cx" style="display: block; padding: 0 10px">                        }),
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -724,7 +718,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = VideoDetails;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"../../controllers/video-details.js":3,"../video-details.js":10}],9:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],9:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*global wp, jQuery, _, MediaElementPlayer */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -906,7 +900,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var MediaDetails = require( './media-details' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var MediaDetails = wp.media.view.MediaDetails,
</ins><span class="cx" style="display: block; padding: 0 10px">         VideoDetails;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> VideoDetails = MediaDetails.extend({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -937,4 +931,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = VideoDetails;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./media-details":9}]},{},[1]);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}]},{},[1]);
</ins></span></pre></div>
<a id="trunksrcwpincludesjsmediacontrollerscollectionaddjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/controllers/collection-add.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/controllers/collection-add.js      2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/controllers/collection-add.js        2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {string}                     attributes.collectionType         The collection type. (e.g. 'playlist').
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> var Selection = wp.media.model.Selection,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        Library = require( './library.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ Library = wp.media.controller.Library,
</ins><span class="cx" style="display: block; padding: 0 10px">         CollectionAdd;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> CollectionAdd = Library.extend({
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediacontrollerscollectioneditjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/controllers/collection-edit.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/controllers/collection-edit.js     2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/controllers/collection-edit.js       2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,9 +34,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {string}                     attributes.type                   The collection's media type. (e.g. 'video').
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {string}                     attributes.collectionType         The collection type. (e.g. 'playlist').
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Library = require( './library.js' ),
-       View = require( '../views/view.js' ),
-       EditLibraryView = require( '../views/attachment/edit-library.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Library = wp.media.controller.Library,
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        $ = jQuery,
</span><span class="cx" style="display: block; padding: 0 10px">        CollectionEdit;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +73,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px">                // The single `Attachment` view to be used in the `Attachments` view.
</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! this.get('AttachmentView') ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.set( 'AttachmentView', EditLibraryView );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.set( 'AttachmentView', wp.media.view.Attachment.EditLibrary );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px">                Library.prototype.initialize.apply( this, arguments );
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,7 +139,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                attachmentsBrowserView.sidebar.set( obj );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( dragInfoText ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        attachmentsBrowserView.toolbar.set( 'dragInfo', new View({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 attachmentsBrowserView.toolbar.set( 'dragInfo', new wp.media.View({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 el: $( '<div class="instructions">' + dragInfoText + '</div>' )[0],
</span><span class="cx" style="display: block; padding: 0 10px">                                priority: -40
</span><span class="cx" style="display: block; padding: 0 10px">                        }) );
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediacontrollerscropperjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/controllers/cropper.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/controllers/cropper.js     2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/controllers/cropper.js       2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,13 +9,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.media.controller.State
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.Model
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var State = require( './state.js' ),
-       ToolbarView = require( '../views/toolbar.js' ),
-       CropperView = require( '../views/cropper.js' ),
-       l10n = wp.media.view.l10n,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var l10n = wp.media.view.l10n,
</ins><span class="cx" style="display: block; padding: 0 10px">         Cropper;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Cropper = State.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Cropper = wp.media.controller.State.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         defaults: {
</span><span class="cx" style="display: block; padding: 0 10px">                id:          'cropper',
</span><span class="cx" style="display: block; padding: 0 10px">                title:       l10n.cropImage,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,7 +35,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        createCropContent: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.cropperView = new CropperView({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.cropperView = new wp.media.view.Cropper({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        attachment: this.get('selection').first()
</span><span class="cx" style="display: block; padding: 0 10px">                });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,7 +101,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        });
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.frame.toolbar.set( new ToolbarView(toolbarOptions) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.frame.toolbar.set( new wp.media.view.Toolbar(toolbarOptions) );
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        doCrop: function( attachment ) {
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediacontrollerseditattachmentmetadatajs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/controllers/edit-attachment-metadata.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/controllers/edit-attachment-metadata.js    2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/controllers/edit-attachment-metadata.js      2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,11 +9,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.media.controller.State
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.Model
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var State = wp.media.controller.State,
-       l10n = wp.media.view.l10n,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var l10n = wp.media.view.l10n,
</ins><span class="cx" style="display: block; padding: 0 10px">         EditAttachmentMetadata;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-EditAttachmentMetadata = State.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+EditAttachmentMetadata = wp.media.controller.State.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         defaults: {
</span><span class="cx" style="display: block; padding: 0 10px">                id:      'edit-attachment',
</span><span class="cx" style="display: block; padding: 0 10px">                // Title string passed to the frame's title region view.
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediacontrollerseditimagejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/controllers/edit-image.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/controllers/edit-image.js  2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/controllers/edit-image.js    2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,12 +18,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {string}                    [attributes.menu=false]         Initial mode for the menu region.
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {string}                    [attributes.url]                Unused. @todo Consider removal.
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var State = require( './state.js' ),
-       ToolbarView = require( '../views/toolbar.js' ),
-       l10n = wp.media.view.l10n,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var l10n = wp.media.view.l10n,
</ins><span class="cx" style="display: block; padding: 0 10px">         EditImage;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-EditImage = State.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+EditImage = wp.media.controller.State.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         defaults: {
</span><span class="cx" style="display: block; padding: 0 10px">                id:      'edit-image',
</span><span class="cx" style="display: block; padding: 0 10px">                title:   l10n.editImage,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,7 +53,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        lastState = frame.lastState(),
</span><span class="cx" style="display: block; padding: 0 10px">                        previous = lastState && lastState.id;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                frame.toolbar.set( new ToolbarView({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         frame.toolbar.set( new wp.media.view.Toolbar({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: frame,
</span><span class="cx" style="display: block; padding: 0 10px">                        items: {
</span><span class="cx" style="display: block; padding: 0 10px">                                back: {
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediacontrollersembedjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/controllers/embed.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/controllers/embed.js       2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/controllers/embed.js 2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,12 +21,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {string} [attributes.url]                   The embed URL.
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {object} [attributes.metadata={}]           Properties of the embed, which will override attributes.url if set.
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var State = require( './state.js' ),
-       l10n = wp.media.view.l10n,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var l10n = wp.media.view.l10n,
</ins><span class="cx" style="display: block; padding: 0 10px">         $ = Backbone.$,
</span><span class="cx" style="display: block; padding: 0 10px">        Embed;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Embed = State.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Embed = wp.media.controller.State.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         defaults: {
</span><span class="cx" style="display: block; padding: 0 10px">                id:       'embed',
</span><span class="cx" style="display: block; padding: 0 10px">                title:    l10n.insertFromUrlTitle,
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediacontrollersfeaturedimagejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/controllers/featured-image.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/controllers/featured-image.js      2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/controllers/featured-image.js        2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {boolean}                    [attributes.syncSelection=true]       Whether the Attachments selection should be persisted from the last state.
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> var Attachment = wp.media.model.Attachment,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        Library = require( './library.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ Library = wp.media.controller.Library,
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        FeaturedImage;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediacontrollersgalleryaddjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/controllers/gallery-add.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/controllers/gallery-add.js 2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/controllers/gallery-add.js   2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  *                                                                          Defaults to false because for this state, because the library of the Edit Gallery state is the selection.
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> var Selection = wp.media.model.Selection,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        Library = require( './library.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ Library = wp.media.controller.Library,
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        GalleryAdd;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediacontrollersgalleryeditjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/controllers/gallery-edit.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/controllers/gallery-edit.js        2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/controllers/gallery-edit.js  2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,9 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {view}                       [attributes.AttachmentView]        The single `Attachment` view to be used in the `Attachments`.
</span><span class="cx" style="display: block; padding: 0 10px">  *                                                                        If none supplied, defaults to wp.media.view.Attachment.EditLibrary.
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Library = require( './library.js' ),
-       EditLibraryView = require( '../views/attachment/edit-library.js' ),
-       GallerySettingsView = require( '../views/settings/gallery.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Library = wp.media.controller.Library,
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        GalleryEdit;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +65,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // The single `Attachment` view to be used in the `Attachments` view.
</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! this.get('AttachmentView') ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.set( 'AttachmentView', EditLibraryView );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.set( 'AttachmentView', wp.media.view.Attachment.EditLibrary );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                Library.prototype.initialize.apply( this, arguments );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,7 +119,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                library.gallery = library.gallery || new Backbone.Model();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                browser.sidebar.set({
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        gallery: new GallerySettingsView({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 gallery: new wp.media.view.Settings.Gallery({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                                model:      library.gallery,
</span><span class="cx" style="display: block; padding: 0 10px">                                priority:   40
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediacontrollersimagedetailsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/controllers/image-details.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/controllers/image-details.js       2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/controllers/image-details.js 2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,8 +24,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @todo This state inherits some defaults from media.controller.Library.prototype.defaults,
</span><span class="cx" style="display: block; padding: 0 10px">  *       however this may not do anything.
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var State = require( './state.js' ),
-       Library = require( './library.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var State = wp.media.controller.State,
+       Library = wp.media.controller.Library,
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        ImageDetails;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediacontrollerslibraryjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/controllers/library.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/controllers/library.js     2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/controllers/library.js       2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,14 +34,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {boolean}                         [attributes.contentUserSetting=true] Whether the content region's mode should be set and persisted per user.
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {boolean}                         [attributes.syncSelection=true]      Whether the Attachments selection should be persisted from the last state.
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var selectionSync = require( '../utils/selection-sync.js' ),
-       State = require( './state.js' ),
-       l10n = wp.media.view.l10n,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var l10n = wp.media.view.l10n,
</ins><span class="cx" style="display: block; padding: 0 10px">         getUserSetting = window.getUserSetting,
</span><span class="cx" style="display: block; padding: 0 10px">        setUserSetting = window.setUserSetting,
</span><span class="cx" style="display: block; padding: 0 10px">        Library;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Library = State.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Library = wp.media.controller.State.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         defaults: {
</span><span class="cx" style="display: block; padding: 0 10px">                id:                 'library',
</span><span class="cx" style="display: block; padding: 0 10px">                title:              l10n.mediaLibraryTitle,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -269,6 +267,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> // Make selectionSync available on any Media Library state.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-_.extend( Library.prototype, selectionSync );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+_.extend( Library.prototype, wp.media.selectionSync );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Library;
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediacontrollersmedialibraryjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/controllers/media-library.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/controllers/media-library.js       2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/controllers/media-library.js 2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.media.controller.State
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.Model
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Library = require( './library.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Library = wp.media.controller.Library,
</ins><span class="cx" style="display: block; padding: 0 10px">         MediaLibrary;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> MediaLibrary = Library.extend({
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediacontrollersreplaceimagejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/controllers/replace-image.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/controllers/replace-image.js       2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/controllers/replace-image.js 2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {boolean}                    [attributes.contentUserSetting=true] Whether the content region's mode should be set and persisted per user.
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {boolean}                    [attributes.syncSelection=true]      Whether the Attachments selection should be persisted from the last state.
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Library = require( './library.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Library = wp.media.controller.Library,
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        ReplaceImage;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediagridjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/grid.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/grid.js    2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/grid.js      2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,11 +10,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.media.controller.State
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.Model
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var State = wp.media.controller.State,
-       l10n = wp.media.view.l10n,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var l10n = wp.media.view.l10n,
</ins><span class="cx" style="display: block; padding: 0 10px">         EditAttachmentMetadata;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-EditAttachmentMetadata = State.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+EditAttachmentMetadata = wp.media.controller.State.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         defaults: {
</span><span class="cx" style="display: block; padding: 0 10px">                id:      'edit-attachment',
</span><span class="cx" style="display: block; padding: 0 10px">                // Title string passed to the frame's title region view.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,6 +139,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = TwoColumn;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> },{}],5:[function(require,module,exports){
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*globals wp */
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * wp.media.view.DeleteSelectedPermanentlyButton
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,7 +154,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> var Button = wp.media.view.Button,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        DeleteSelected = require( './delete-selected.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ DeleteSelected = wp.media.view.DeleteSelectedButton,
</ins><span class="cx" style="display: block; padding: 0 10px">         DeleteSelectedPermanently;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> DeleteSelectedPermanently = DeleteSelected.extend({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -186,7 +187,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = DeleteSelectedPermanently;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./delete-selected.js":6}],6:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],6:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -365,14 +366,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> var Frame = wp.media.view.Frame,
</span><span class="cx" style="display: block; padding: 0 10px">        MediaFrame = wp.media.view.MediaFrame,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        Modal = wp.media.view.Modal,
-       AttachmentCompat = wp.media.view.AttachmentCompat,
-       EditImageController = wp.media.controller.EditImage,
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        EditAttachmentMetadata = require( '../../controllers/edit-attachment-metadata.js' ),
-       TwoColumn = require( '../attachment/details-two-column.js' ),
-       DetailsView = require( '../edit-image-details.js' ),
-
</del><span class="cx" style="display: block; padding: 0 10px">         $ = jQuery,
</span><span class="cx" style="display: block; padding: 0 10px">        EditAttachments;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -427,7 +421,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        createModal: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                // Initialize modal container view.
</span><span class="cx" style="display: block; padding: 0 10px">                if ( this.options.modal ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.modal = new Modal({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.modal = new wp.media.view.Modal({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                                title:      this.options.title
</span><span class="cx" style="display: block; padding: 0 10px">                        });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -456,7 +450,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        createStates: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                this.states.add([
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new EditAttachmentMetadata( { model: this.model } )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.EditAttachmentMetadata( { model: this.model } )
</ins><span class="cx" style="display: block; padding: 0 10px">                 ]);
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -467,7 +461,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         *                               should be set with the proper region view.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        editMetadataMode: function( contentRegion ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                contentRegion.view = new TwoColumn({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         contentRegion.view = new wp.media.view.Attachment.Details.TwoColumn({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        model:      this.model
</span><span class="cx" style="display: block; padding: 0 10px">                });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -476,7 +470,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                 * Attach a subview to display fields added via the
</span><span class="cx" style="display: block; padding: 0 10px">                 * `attachment_fields_to_edit` filter.
</span><span class="cx" style="display: block; padding: 0 10px">                 */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                contentRegion.view.views.set( '.attachment-compat', new AttachmentCompat({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         contentRegion.view.views.set( '.attachment-compat', new wp.media.view.AttachmentCompat({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        model:      this.model
</span><span class="cx" style="display: block; padding: 0 10px">                }) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -494,7 +488,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         *                               should be set with the proper region view.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        editImageMode: function( contentRegion ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                var editImageController = new EditImageController( {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         var editImageController = new wp.media.controller.EditImage( {
</ins><span class="cx" style="display: block; padding: 0 10px">                         model: this.model,
</span><span class="cx" style="display: block; padding: 0 10px">                        frame: this
</span><span class="cx" style="display: block; padding: 0 10px">                } );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -503,7 +497,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                editImageController._router = function() {};
</span><span class="cx" style="display: block; padding: 0 10px">                editImageController._menu = function() {};
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                contentRegion.view = new DetailsView( {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         contentRegion.view = new wp.media.view.EditImage.Details( {
</ins><span class="cx" style="display: block; padding: 0 10px">                         model: this.model,
</span><span class="cx" style="display: block; padding: 0 10px">                        frame: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        controller: editImageController
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -596,7 +590,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = EditAttachments;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"../../controllers/edit-attachment-metadata.js":1,"../attachment/details-two-column.js":4,"../edit-image-details.js":8}],10:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],10:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp, _, Backbone */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -615,12 +609,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @mixes wp.media.controller.StateMachine
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> var MediaFrame = wp.media.view.MediaFrame,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        UploaderWindow = wp.media.view.UploaderWindow,
-       AttachmentsBrowser = wp.media.view.AttachmentsBrowser,
</del><span class="cx" style="display: block; padding: 0 10px">         Library = wp.media.controller.Library,
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        Router = require( '../../routers/manage.js' ),
-
</del><span class="cx" style="display: block; padding: 0 10px">         $ = Backbone.$,
</span><span class="cx" style="display: block; padding: 0 10px">        Manage;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -657,7 +647,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Initialize a window-wide uploader.
</span><span class="cx" style="display: block; padding: 0 10px">                if ( this.options.uploader ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.uploader = new UploaderWindow({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.uploader = new wp.media.view.UploaderWindow({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                                uploader: {
</span><span class="cx" style="display: block; padding: 0 10px">                                        dropzone:  document.body,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -670,7 +660,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        this.options.uploader = false;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.gridRouter = new Router();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.gridRouter = new wp.media.view.MediaFrame.Manage.Router();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Call 'initialize' directly on the parent class.
</span><span class="cx" style="display: block; padding: 0 10px">                MediaFrame.prototype.initialize.apply( this, arguments );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -820,7 +810,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                var state = this.state();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Browse our library of attachments.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.browserView = contentRegion.view = new AttachmentsBrowser({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.browserView = contentRegion.view = new wp.media.view.AttachmentsBrowser({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        collection: state.get('library'),
</span><span class="cx" style="display: block; padding: 0 10px">                        selection:  state.get('selection'),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -870,4 +860,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Manage;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"../../routers/manage.js":3}]},{},[2]);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}]},{},[2]);
</ins></span></pre></div>
<a id="trunksrcwpincludesjsmediamodelsattachmentjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/models/attachment.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/models/attachment.js       2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/models/attachment.js 2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,7 +145,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @returns {wp.media.model.Attachment}
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        create: function( attrs ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                var Attachments = require( './attachments.js' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         var Attachments = wp.media.model.Attachments;
</ins><span class="cx" style="display: block; padding: 0 10px">                 return Attachments.all.push( attrs );
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,7 +160,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @returns {wp.media.model.Attachment}
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        get: _.memoize( function( id, attachment ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                var Attachments = require( './attachments.js' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         var Attachments = wp.media.model.Attachments;
</ins><span class="cx" style="display: block; padding: 0 10px">                 return Attachments.all.push( attachment || { id: id } );
</span><span class="cx" style="display: block; padding: 0 10px">        })
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediamodelsattachmentsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/models/attachments.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/models/attachments.js      2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/models/attachments.js        2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,14 +22,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {string} [options.filters]
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Attachment = require( './attachment.js' ),
-       Attachments;
-
-Attachments = Backbone.Collection.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Attachments = Backbone.Collection.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         /**
</span><span class="cx" style="display: block; padding: 0 10px">         * @type {wp.media.model.Attachment}
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        model: Attachment,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ model: wp.media.model.Attachment,
</ins><span class="cx" style="display: block; padding: 0 10px">         /**
</span><span class="cx" style="display: block; padding: 0 10px">         * @param {Array} [models=[]] Array of models used to populate the collection.
</span><span class="cx" style="display: block; padding: 0 10px">         * @param {Object} [options={}]
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -367,7 +364,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                id = attrs.id;
</span><span class="cx" style="display: block; padding: 0 10px">                        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        attachment = Attachment.get( id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 attachment = wp.media.model.Attachment.get( id );
</ins><span class="cx" style="display: block; padding: 0 10px">                         newAttributes = attachment.parse( attrs, xhr );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! _.isEqual( attachment.attributes, newAttributes ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -383,12 +380,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @access private
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        _requery: function( refresh ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                var props, Query;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         var props;
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( this.props.get('query') ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        Query = require( './query.js' );
</del><span class="cx" style="display: block; padding: 0 10px">                         props = this.props.toJSON();
</span><span class="cx" style="display: block; padding: 0 10px">                        props.cache = ( true !== refresh );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.mirror( Query.get( props ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.mirror( wp.media.model.Query.get( props ) );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediamodelspostimagejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/models/post-image.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/models/post-image.js       2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/models/post-image.js 2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,12 +13,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {int} [attributes]               Initial model attributes.
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {int} [attributes.attachment_id] ID of the attachment.
</span><span class="cx" style="display: block; padding: 0 10px">  **/
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Attachment = require( './attachment' ),
-       PostImage;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var PostImage = Backbone.Model.extend({
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-PostImage = Backbone.Model.extend({
-
</del><span class="cx" style="display: block; padding: 0 10px">         initialize: function( attributes ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                var Attachment = wp.media.model.Attachment;
</ins><span class="cx" style="display: block; padding: 0 10px">                 this.attachment = false;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( attributes.attachment_id ) {
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediamodelsqueryjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/models/query.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/models/query.js    2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/models/query.js      2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,7 +17,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {object} [options.args]                Attachments query arguments.
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {object} [options.args.posts_per_page]
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Attachments = require( './attachments.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Attachments = wp.media.model.Attachments,
</ins><span class="cx" style="display: block; padding: 0 10px">         Query;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> Query = Attachments.extend({
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediamodelsselectionjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/models/selection.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/models/selection.js        2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/models/selection.js  2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,4 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _ */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*globals wp, _ */
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * wp.media.model.Selection
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.media.model.Attachments
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.Collection
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Attachments = require( './attachments.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Attachments = wp.media.model.Attachments,
</ins><span class="cx" style="display: block; padding: 0 10px">         Selection;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> Selection = Attachments.extend({
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediamodelsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/models.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/models.js  2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/models.js    2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,8 +58,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> media.model.settings = l10n.settings || {};
</span><span class="cx" style="display: block; padding: 0 10px"> delete l10n.settings;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Attachment = media.model.Attachment = require( './models/attachment.js' );
</ins><span class="cx" style="display: block; padding: 0 10px"> Attachments = media.model.Attachments = require( './models/attachments.js' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Attachment = media.model.Attachment = require( './models/attachment.js' );
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> media.model.Query = require( './models/query.js' );
</span><span class="cx" style="display: block; padding: 0 10px"> media.model.PostImage = require( './models/post-image.js' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -379,7 +379,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @returns {wp.media.model.Attachment}
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        create: function( attrs ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                var Attachments = require( './attachments.js' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         var Attachments = wp.media.model.Attachments;
</ins><span class="cx" style="display: block; padding: 0 10px">                 return Attachments.all.push( attrs );
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -394,14 +394,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @returns {wp.media.model.Attachment}
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        get: _.memoize( function( id, attachment ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                var Attachments = require( './attachments.js' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         var Attachments = wp.media.model.Attachments;
</ins><span class="cx" style="display: block; padding: 0 10px">                 return Attachments.all.push( attachment || { id: id } );
</span><span class="cx" style="display: block; padding: 0 10px">        })
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Attachment;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./attachments.js":3}],3:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],3:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp, _, Backbone */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -426,14 +426,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {string} [options.filters]
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Attachment = require( './attachment.js' ),
-       Attachments;
-
-Attachments = Backbone.Collection.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Attachments = Backbone.Collection.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         /**
</span><span class="cx" style="display: block; padding: 0 10px">         * @type {wp.media.model.Attachment}
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        model: Attachment,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ model: wp.media.model.Attachment,
</ins><span class="cx" style="display: block; padding: 0 10px">         /**
</span><span class="cx" style="display: block; padding: 0 10px">         * @param {Array} [models=[]] Array of models used to populate the collection.
</span><span class="cx" style="display: block; padding: 0 10px">         * @param {Object} [options={}]
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -771,7 +768,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                id = attrs.id;
</span><span class="cx" style="display: block; padding: 0 10px">                        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        attachment = Attachment.get( id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 attachment = wp.media.model.Attachment.get( id );
</ins><span class="cx" style="display: block; padding: 0 10px">                         newAttributes = attachment.parse( attrs, xhr );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! _.isEqual( attachment.attributes, newAttributes ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -787,12 +784,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @access private
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        _requery: function( refresh ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                var props, Query;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         var props;
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( this.props.get('query') ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        Query = require( './query.js' );
</del><span class="cx" style="display: block; padding: 0 10px">                         props = this.props.toJSON();
</span><span class="cx" style="display: block; padding: 0 10px">                        props.cache = ( true !== refresh );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.mirror( Query.get( props ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.mirror( wp.media.model.Query.get( props ) );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -939,7 +935,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Attachments;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./attachment.js":2,"./query.js":5}],4:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],4:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals Backbone */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -955,12 +951,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {int} [attributes]               Initial model attributes.
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {int} [attributes.attachment_id] ID of the attachment.
</span><span class="cx" style="display: block; padding: 0 10px">  **/
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Attachment = require( './attachment' ),
-       PostImage;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var PostImage = Backbone.Model.extend({
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-PostImage = Backbone.Model.extend({
-
</del><span class="cx" style="display: block; padding: 0 10px">         initialize: function( attributes ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                var Attachment = wp.media.model.Attachment;
</ins><span class="cx" style="display: block; padding: 0 10px">                 this.attachment = false;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( attributes.attachment_id ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1097,7 +1091,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = PostImage;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./attachment":2}],5:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],5:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp, _ */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1117,7 +1111,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {object} [options.args]                Attachments query arguments.
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {object} [options.args.posts_per_page]
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Attachments = require( './attachments.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Attachments = wp.media.model.Attachments,
</ins><span class="cx" style="display: block; padding: 0 10px">         Query;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> Query = Attachments.extend({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1407,8 +1401,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Query;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./attachments.js":3}],6:[function(require,module,exports){
-/*globals _ */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],6:[function(require,module,exports){
+/*globals wp, _ */
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * wp.media.model.Selection
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1419,7 +1413,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.media.model.Attachments
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.Collection
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Attachments = require( './attachments.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Attachments = wp.media.model.Attachments,
</ins><span class="cx" style="display: block; padding: 0 10px">         Selection;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> Selection = Attachments.extend({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1506,4 +1500,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Selection;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./attachments.js":3}]},{},[1]);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}]},{},[1]);
</ins></span></pre></div>
<a id="trunksrcwpincludesjsmediamodelsmanifestjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/models.manifest.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/models.manifest.js 2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/models.manifest.js   2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,8 +57,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> media.model.settings = l10n.settings || {};
</span><span class="cx" style="display: block; padding: 0 10px"> delete l10n.settings;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Attachment = media.model.Attachment = require( './models/attachment.js' );
</ins><span class="cx" style="display: block; padding: 0 10px"> Attachments = media.model.Attachments = require( './models/attachments.js' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Attachment = media.model.Attachment = require( './models/attachment.js' );
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> media.model.Query = require( './models/query.js' );
</span><span class="cx" style="display: block; padding: 0 10px"> media.model.PostImage = require( './models/post-image.js' );
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsattachmentdetailsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/attachment/details.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/attachment/details.js        2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/attachment/details.js  2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Attachment = require( '../attachment.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Attachment = wp.media.view.Attachment,
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        Details;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsattachmenteditlibraryjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/attachment/edit-library.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/attachment/edit-library.js   2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/attachment/edit-library.js     2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,3 +1,5 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*globals wp */
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * wp.media.view.Attachment.EditLibrary
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,10 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Attachment = require( '../attachment.js' ),
-       EditLibrary;
-
-EditLibrary = Attachment.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var EditLibrary = wp.media.view.Attachment.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         buttons: {
</span><span class="cx" style="display: block; padding: 0 10px">                close: true
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsattachmenteditselectionjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/attachment/edit-selection.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/attachment/edit-selection.js 2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/attachment/edit-selection.js   2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,3 +1,5 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*globals wp */
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * wp.media.view.Attachments.EditSelection
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,10 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Selection = require( './selection.js' ),
-       EditSelection;
-
-EditSelection = Selection.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var EditSelection = wp.media.view.Attachment.Selection.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         buttons: {
</span><span class="cx" style="display: block; padding: 0 10px">                close: true
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsattachmentlibraryjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/attachment/library.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/attachment/library.js        2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/attachment/library.js  2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,3 +1,5 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*globals wp */
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * wp.media.view.Attachment.Library
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,10 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Attachment = require( '../attachment.js' ),
-       Library;
-
-Library = Attachment.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Library = wp.media.view.Attachment.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         buttons: {
</span><span class="cx" style="display: block; padding: 0 10px">                check: true
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsattachmentselectionjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/attachment/selection.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/attachment/selection.js      2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/attachment/selection.js        2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,3 +1,5 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*globals wp */
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * wp.media.view.Attachment.Selection
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,10 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Attachment = require( '../attachment.js' ),
-       Selection;
-
-Selection = Attachment.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Selection = wp.media.view.Attachment.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         className: 'attachment selection',
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        // On click, just select the model, instead of removing the model from
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsattachmentcompatjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/attachment-compat.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/attachment-compat.js 2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/attachment-compat.js   2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var View = wp.media.View,
</ins><span class="cx" style="display: block; padding: 0 10px">         AttachmentCompat;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> AttachmentCompat = View.extend({
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsattachmentfiltersalljs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/attachment-filters/all.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/attachment-filters/all.js    2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/attachment-filters/all.js      2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,11 +9,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var AttachmentFilters = require( '../attachment-filters.js' ),
-       l10n = wp.media.view.l10n,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var l10n = wp.media.view.l10n,
</ins><span class="cx" style="display: block; padding: 0 10px">         All;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-All = AttachmentFilters.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+All = wp.media.view.AttachmentFilters.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         createFilters: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                var filters = {};
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsattachmentfiltersdatejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/attachment-filters/date.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/attachment-filters/date.js   2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/attachment-filters/date.js     2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,11 +9,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var AttachmentFilters = require( '../attachment-filters.js' ),
-       l10n = wp.media.view.l10n,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var l10n = wp.media.view.l10n,
</ins><span class="cx" style="display: block; padding: 0 10px">         DateFilter;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-DateFilter = AttachmentFilters.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+DateFilter = wp.media.view.AttachmentFilters.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         id: 'media-attachment-date-filters',
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        createFilters: function() {
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsattachmentfiltersuploadedjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/attachment-filters/uploaded.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/attachment-filters/uploaded.js       2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/attachment-filters/uploaded.js 2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,11 +9,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var AttachmentFilters = require( '../attachment-filters.js' ),
-       l10n = wp.media.view.l10n,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var l10n = wp.media.view.l10n,
</ins><span class="cx" style="display: block; padding: 0 10px">         Uploaded;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Uploaded = AttachmentFilters.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Uploaded = wp.media.view.AttachmentFilters.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         createFilters: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                var type = this.model.get('type'),
</span><span class="cx" style="display: block; padding: 0 10px">                        types = wp.media.view.settings.mimeTypes,
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsattachmentfiltersjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/attachment-filters.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/attachment-filters.js        2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/attachment-filters.js  2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,11 +8,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       $ = jQuery,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var $ = jQuery,
</ins><span class="cx" style="display: block; padding: 0 10px">         AttachmentFilters;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-AttachmentFilters = View.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+AttachmentFilters = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         tagName:   'select',
</span><span class="cx" style="display: block; padding: 0 10px">        className: 'attachment-filters',
</span><span class="cx" style="display: block; padding: 0 10px">        id:        'media-attachment-filters',
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsattachmentjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/attachment.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/attachment.js        2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/attachment.js  2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var View = wp.media.View,
</ins><span class="cx" style="display: block; padding: 0 10px">         $ = jQuery,
</span><span class="cx" style="display: block; padding: 0 10px">        Attachment;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsattachmentsbrowserjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/attachments/browser.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/attachments/browser.js       2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/attachments/browser.js 2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,22 +20,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {bool|string} [options.sidebar=true]  Whether to create a sidebar for the browser.
</span><span class="cx" style="display: block; padding: 0 10px">  *                                              Accepts true, false, and 'errors'.
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( '../view.js' ),
-       Library = require( '../attachment/library.js' ),
-       Toolbar = require( '../toolbar.js' ),
-       Spinner = require( '../spinner.js' ),
-       Search = require( '../search.js' ),
-       Label = require( '../label.js' ),
-       Uploaded = require( '../attachment-filters/uploaded.js' ),
-       All = require( '../attachment-filters/all.js' ),
-       DateFilter = require( '../attachment-filters/date.js' ),
-       UploaderInline = require( '../uploader/inline.js' ),
-       Attachments = require( '../attachments.js' ),
-       Sidebar = require( '../sidebar.js' ),
-       UploaderStatus = require( '../uploader/status.js' ),
-       Details = require( '../attachment/details.js' ),
-       AttachmentCompat = require( '../attachment-compat.js' ),
-       AttachmentDisplay = require( '../settings/attachment-display.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var View = wp.media.View,
</ins><span class="cx" style="display: block; padding: 0 10px">         mediaTrash = wp.media.view.settings.mediaTrash,
</span><span class="cx" style="display: block; padding: 0 10px">        l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        $ = jQuery,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +37,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        date:    true,
</span><span class="cx" style="display: block; padding: 0 10px">                        display: false,
</span><span class="cx" style="display: block; padding: 0 10px">                        sidebar: true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        AttachmentView: Library
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 AttachmentView: wp.media.view.Attachment.Library
</ins><span class="cx" style="display: block; padding: 0 10px">                 });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                this.listenTo( this.controller, 'toggle:upload:attachment', _.bind( this.toggleUploader, this ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,18 +88,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">                /**
</span><span class="cx" style="display: block; padding: 0 10px">                * @member {wp.media.view.Toolbar}
</span><span class="cx" style="display: block; padding: 0 10px">                */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.toolbar = new Toolbar( toolbarOptions );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.toolbar = new wp.media.view.Toolbar( toolbarOptions );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                this.views.add( this.toolbar );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.toolbar.set( 'spinner', new Spinner({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.toolbar.set( 'spinner', new wp.media.view.Spinner({
</ins><span class="cx" style="display: block; padding: 0 10px">                         priority: -60
</span><span class="cx" style="display: block; padding: 0 10px">                }) );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( -1 !== $.inArray( this.options.filters, [ 'uploaded', 'all' ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        // "Filters" will return a <select>, need to render
</span><span class="cx" style="display: block; padding: 0 10px">                        // screen reader text before
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.toolbar.set( 'filtersLabel', new Label({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.toolbar.set( 'filtersLabel', new wp.media.view.Label({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 value: l10n.filterByType,
</span><span class="cx" style="display: block; padding: 0 10px">                                attributes: {
</span><span class="cx" style="display: block; padding: 0 10px">                                        'for':  'media-attachment-filters'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,13 +108,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        }).render() );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 'uploaded' === this.options.filters ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                this.toolbar.set( 'filters', new Uploaded({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         this.toolbar.set( 'filters', new wp.media.view.AttachmentFilters.Uploaded({
</ins><span class="cx" style="display: block; padding: 0 10px">                                         controller: this.controller,
</span><span class="cx" style="display: block; padding: 0 10px">                                        model:      this.collection.props,
</span><span class="cx" style="display: block; padding: 0 10px">                                        priority:   -80
</span><span class="cx" style="display: block; padding: 0 10px">                                }).render() );
</span><span class="cx" style="display: block; padding: 0 10px">                        } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                Filters = new All({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         Filters = new wp.media.view.AttachmentFilters.All({
</ins><span class="cx" style="display: block; padding: 0 10px">                                         controller: this.controller,
</span><span class="cx" style="display: block; padding: 0 10px">                                        model:      this.collection.props,
</span><span class="cx" style="display: block; padding: 0 10px">                                        priority:   -80
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,14 +139,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        }).render() );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        // DateFilter is a <select>, screen reader text needs to be rendered before
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.toolbar.set( 'dateFilterLabel', new Label({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.toolbar.set( 'dateFilterLabel', new wp.media.view.Label({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 value: l10n.filterByDate,
</span><span class="cx" style="display: block; padding: 0 10px">                                attributes: {
</span><span class="cx" style="display: block; padding: 0 10px">                                        'for': 'media-attachment-date-filters'
</span><span class="cx" style="display: block; padding: 0 10px">                                },
</span><span class="cx" style="display: block; padding: 0 10px">                                priority: -75
</span><span class="cx" style="display: block; padding: 0 10px">                        }).render() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.toolbar.set( 'dateFilter', new DateFilter({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.toolbar.set( 'dateFilter', new wp.media.view.DateFilter({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 controller: this.controller,
</span><span class="cx" style="display: block; padding: 0 10px">                                model:      this.collection.props,
</span><span class="cx" style="display: block; padding: 0 10px">                                priority: -75
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,14 +250,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                } else if ( this.options.date ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        // DateFilter is a <select>, screen reader text needs to be rendered before
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.toolbar.set( 'dateFilterLabel', new Label({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.toolbar.set( 'dateFilterLabel', new wp.media.view.Label({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 value: l10n.filterByDate,
</span><span class="cx" style="display: block; padding: 0 10px">                                attributes: {
</span><span class="cx" style="display: block; padding: 0 10px">                                        'for': 'media-attachment-date-filters'
</span><span class="cx" style="display: block; padding: 0 10px">                                },
</span><span class="cx" style="display: block; padding: 0 10px">                                priority: -75
</span><span class="cx" style="display: block; padding: 0 10px">                        }).render() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.toolbar.set( 'dateFilter', new DateFilter({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.toolbar.set( 'dateFilter', new wp.media.view.DateFilter({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 controller: this.controller,
</span><span class="cx" style="display: block; padding: 0 10px">                                model:      this.collection.props,
</span><span class="cx" style="display: block; padding: 0 10px">                                priority: -75
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -281,14 +266,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( this.options.search ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        // Search is an input, screen reader text needs to be rendered before
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.toolbar.set( 'searchLabel', new Label({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.toolbar.set( 'searchLabel', new wp.media.view.Label({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 value: l10n.searchMediaLabel,
</span><span class="cx" style="display: block; padding: 0 10px">                                attributes: {
</span><span class="cx" style="display: block; padding: 0 10px">                                        'for': 'media-search-input'
</span><span class="cx" style="display: block; padding: 0 10px">                                },
</span><span class="cx" style="display: block; padding: 0 10px">                                priority:   60
</span><span class="cx" style="display: block; padding: 0 10px">                        }).render() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.toolbar.set( 'search', new Search({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.toolbar.set( 'search', new wp.media.view.Search({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 controller: this.controller,
</span><span class="cx" style="display: block; padding: 0 10px">                                model:      this.collection.props,
</span><span class="cx" style="display: block; padding: 0 10px">                                priority:   60
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -337,7 +322,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        createUploader: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.uploader = new UploaderInline({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.uploader = new wp.media.view.UploaderInline({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this.controller,
</span><span class="cx" style="display: block; padding: 0 10px">                        status:     false,
</span><span class="cx" style="display: block; padding: 0 10px">                        message:    this.controller.isModeActive( 'grid' ) ? '' : l10n.noItemsFound,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -357,7 +342,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        createAttachments: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.attachments = new Attachments({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.attachments = new wp.media.view.Attachments({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller:           this.controller,
</span><span class="cx" style="display: block; padding: 0 10px">                        collection:           this.collection,
</span><span class="cx" style="display: block; padding: 0 10px">                        selection:            this.options.selection,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -393,14 +378,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">        createSidebar: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                var options = this.options,
</span><span class="cx" style="display: block; padding: 0 10px">                        selection = options.selection,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        sidebar = this.sidebar = new Sidebar({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 sidebar = this.sidebar = new wp.media.view.Sidebar({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 controller: this.controller
</span><span class="cx" style="display: block; padding: 0 10px">                        });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                this.views.add( sidebar );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( this.controller.uploader ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        sidebar.set( 'uploads', new UploaderStatus({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 sidebar.set( 'uploads', new wp.media.view.UploaderStatus({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 controller: this.controller,
</span><span class="cx" style="display: block; padding: 0 10px">                                priority:   40
</span><span class="cx" style="display: block; padding: 0 10px">                        }) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -418,20 +403,20 @@
</span><span class="cx" style="display: block; padding: 0 10px">                var sidebar = this.sidebar,
</span><span class="cx" style="display: block; padding: 0 10px">                        single = this.options.selection.single();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                sidebar.set( 'details', new Details({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         sidebar.set( 'details', new wp.media.view.Attachment.Details({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this.controller,
</span><span class="cx" style="display: block; padding: 0 10px">                        model:      single,
</span><span class="cx" style="display: block; padding: 0 10px">                        priority:   80
</span><span class="cx" style="display: block; padding: 0 10px">                }) );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                sidebar.set( 'compat', new AttachmentCompat({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         sidebar.set( 'compat', new wp.media.view.AttachmentCompat({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this.controller,
</span><span class="cx" style="display: block; padding: 0 10px">                        model:      single,
</span><span class="cx" style="display: block; padding: 0 10px">                        priority:   120
</span><span class="cx" style="display: block; padding: 0 10px">                }) );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( this.options.display ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        sidebar.set( 'display', new AttachmentDisplay({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 sidebar.set( 'display', new wp.media.view.Settings.AttachmentDisplay({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 controller:   this.controller,
</span><span class="cx" style="display: block; padding: 0 10px">                                model:        this.model.display( single ),
</span><span class="cx" style="display: block; padding: 0 10px">                                attachment:   single,
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsattachmentsselectionjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/attachments/selection.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/attachments/selection.js     2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/attachments/selection.js       2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,4 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _ */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*globals wp, _ */
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * wp.media.view.Attachments.Selection
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,8 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Attachments = require( '../attachments.js' ),
-       AttachmentSelection = require( '../attachment/selection.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Attachments = wp.media.view.Attachments,
</ins><span class="cx" style="display: block; padding: 0 10px">         Selection;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> Selection = Attachments.extend({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +20,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        resize:     false,
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        // The single `Attachment` view to be used in the `Attachments` view.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        AttachmentView: AttachmentSelection
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 AttachmentView: wp.media.view.Attachment.Selection
</ins><span class="cx" style="display: block; padding: 0 10px">                 });
</span><span class="cx" style="display: block; padding: 0 10px">                // Call 'initialize' directly on the parent class.
</span><span class="cx" style="display: block; padding: 0 10px">                return Attachments.prototype.initialize.apply( this, arguments );
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsattachmentsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/attachments.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/attachments.js       2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/attachments.js 2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,8 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       Attachment = require( './attachment.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var View = wp.media.View,
</ins><span class="cx" style="display: block; padding: 0 10px">         $ = jQuery,
</span><span class="cx" style="display: block; padding: 0 10px">        Attachments;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +26,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                _.defaults( this.options, {
</span><span class="cx" style="display: block; padding: 0 10px">                        refreshSensitivity: wp.media.isTouchDevice ? 300 : 200,
</span><span class="cx" style="display: block; padding: 0 10px">                        refreshThreshold:   3,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        AttachmentView:     Attachment,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 AttachmentView:     wp.media.view.Attachment,
</ins><span class="cx" style="display: block; padding: 0 10px">                         sortable:           false,
</span><span class="cx" style="display: block; padding: 0 10px">                        resize:             true,
</span><span class="cx" style="display: block; padding: 0 10px">                        idealColumnWidth:   $( window ).width() < 640 ? 135 : 150
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsaudiodetailsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/audio-details.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/audio-details.js     2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/audio-details.js       2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var MediaDetails = require( './media-details' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var MediaDetails = wp.media.view.MediaDetails,
</ins><span class="cx" style="display: block; padding: 0 10px">         AudioDetails;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> AudioDetails = MediaDetails.extend({
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsbuttondeleteselectedpermanentlyjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/button/delete-selected-permanently.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/button/delete-selected-permanently.js        2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/button/delete-selected-permanently.js  2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,3 +1,5 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*globals wp */
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * wp.media.view.DeleteSelectedPermanentlyButton
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +13,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> var Button = wp.media.view.Button,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        DeleteSelected = require( './delete-selected.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ DeleteSelected = wp.media.view.DeleteSelectedButton,
</ins><span class="cx" style="display: block; padding: 0 10px">         DeleteSelectedPermanently;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> DeleteSelectedPermanently = DeleteSelected.extend({
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsbuttongroupjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/button-group.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/button-group.js      2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/button-group.js        2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,12 +8,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       Button = require( './button.js' ),
-       $ = Backbone.$,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var $ = Backbone.$,
</ins><span class="cx" style="display: block; padding: 0 10px">         ButtonGroup;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-ButtonGroup = View.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ButtonGroup = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         tagName:   'div',
</span><span class="cx" style="display: block; padding: 0 10px">        className: 'button-group button-large media-button-group',
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +23,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( button instanceof Backbone.View ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                return button;
</span><span class="cx" style="display: block; padding: 0 10px">                        } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new Button( button ).render();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new wp.media.view.Button( button ).render();
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><span class="cx" style="display: block; padding: 0 10px">                });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsbuttonjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/button.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/button.js    2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/button.js      2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,10 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       Button;
-
-Button = View.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Button = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         tagName:    'a',
</span><span class="cx" style="display: block; padding: 0 10px">        className:  'media-button',
</span><span class="cx" style="display: block; padding: 0 10px">        attributes: { href: '#' },
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewscropperjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/cropper.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/cropper.js   2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/cropper.js     2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,9 +14,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       UploaderStatusError = require( './uploader/status-error.js' ),
-       UploaderStatus = require( './uploader/status.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var View = wp.media.View,
+       UploaderStatus = wp.media.view.UploaderStatus,
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        $ = jQuery,
</span><span class="cx" style="display: block; padding: 0 10px">        Cropper;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,7 +57,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        onError: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                var filename = this.options.attachment.get('filename');
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.views.add( '.upload-errors', new UploaderStatusError({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.views.add( '.upload-errors', new wp.media.view.UploaderStatusError({
</ins><span class="cx" style="display: block; padding: 0 10px">                         filename: UploaderStatus.prototype.filename(filename),
</span><span class="cx" style="display: block; padding: 0 10px">                        message: window._wpMediaViewsL10n.cropError
</span><span class="cx" style="display: block; padding: 0 10px">                }), { at: 0 });
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewseditimagejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/edit-image.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/edit-image.js        2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/edit-image.js  2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var View = wp.media.View,
</ins><span class="cx" style="display: block; padding: 0 10px">         EditImage;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> EditImage = View.extend({
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsembedimagejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/embed/image.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/embed/image.js       2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/embed/image.js 2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var AttachmentDisplay = require( '../settings/attachment-display.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var AttachmentDisplay = wp.media.view.Settings.AttachmentDisplay,
</ins><span class="cx" style="display: block; padding: 0 10px">         EmbedImage;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> EmbedImage = AttachmentDisplay.extend({
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsembedlinkjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/embed/link.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/embed/link.js        2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/embed/link.js  2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,11 +9,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Settings = require( '../settings.js' ),
-       $ = jQuery,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var $ = jQuery,
</ins><span class="cx" style="display: block; padding: 0 10px">         EmbedLink;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-EmbedLink = Settings.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+EmbedLink = wp.media.view.Settings.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         className: 'embed-link-settings',
</span><span class="cx" style="display: block; padding: 0 10px">        template:  wp.template('embed-link-settings'),
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsembedurljs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/embed/url.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/embed/url.js 2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/embed/url.js   2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( '../view.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var View = wp.media.View,
</ins><span class="cx" style="display: block; padding: 0 10px">         $ = jQuery,
</span><span class="cx" style="display: block; padding: 0 10px">        EmbedUrl;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsembedjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/embed.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/embed.js     2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/embed.js       2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,20 +6,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       EmbedImage = require( './embed/image.js' ),
-       EmbedLink = require( './embed/link.js' ),
-       EmbedUrl = require( './embed/url.js' ),
-       Embed;
-
-Embed = View.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Embed = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         className: 'media-embed',
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        initialize: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                /**
</span><span class="cx" style="display: block; padding: 0 10px">                 * @member {wp.media.view.EmbedUrl}
</span><span class="cx" style="display: block; padding: 0 10px">                 */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.url = new EmbedUrl({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.url = new wp.media.view.EmbedUrl({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this.controller,
</span><span class="cx" style="display: block; padding: 0 10px">                        model:      this.model.props
</span><span class="cx" style="display: block; padding: 0 10px">                }).render();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,9 +40,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        constructor;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'image' === type ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        constructor = EmbedImage;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 constructor = wp.media.view.EmbedImage;
</ins><span class="cx" style="display: block; padding: 0 10px">                 } else if ( 'link' === type ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        constructor = EmbedLink;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 constructor = wp.media.view.EmbedLink;
</ins><span class="cx" style="display: block; padding: 0 10px">                 } else {
</span><span class="cx" style="display: block; padding: 0 10px">                        return;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsfocusmanagerjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/focus-manager.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/focus-manager.js     2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/focus-manager.js       2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,11 +6,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       FocusManager;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var FocusManager = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-FocusManager = View.extend({
-
</del><span class="cx" style="display: block; padding: 0 10px">         events: {
</span><span class="cx" style="display: block; padding: 0 10px">                'keydown': 'constrainTabbing'
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsframeaudiodetailsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/frame/audio-details.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/frame/audio-details.js       2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/frame/audio-details.js 2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,9 +15,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> var MediaDetails = wp.media.view.MediaFrame.MediaDetails,
</span><span class="cx" style="display: block; padding: 0 10px">        MediaLibrary = wp.media.controller.MediaLibrary,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        
-       AudioDetailsView = require( '../audio-details.js' ),
-       AudioDetailsController = require( '../../controllers/audio-details.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        AudioDetails;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +32,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        initialize: function( options ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                options.DetailsView = AudioDetailsView;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         options.DetailsView = wp.media.view.AudioDetails;
</ins><span class="cx" style="display: block; padding: 0 10px">                 options.cancelText = l10n.audioDetailsCancel;
</span><span class="cx" style="display: block; padding: 0 10px">                options.addText = l10n.audioAddSourceTitle;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +48,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        createStates: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                this.states.add([
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new AudioDetailsController( {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.AudioDetails( {
</ins><span class="cx" style="display: block; padding: 0 10px">                                 media: this.media
</span><span class="cx" style="display: block; padding: 0 10px">                        } ),
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsframeeditattachmentsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/frame/edit-attachments.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/frame/edit-attachments.js    2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/frame/edit-attachments.js      2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,14 +18,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> var Frame = wp.media.view.Frame,
</span><span class="cx" style="display: block; padding: 0 10px">        MediaFrame = wp.media.view.MediaFrame,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        Modal = wp.media.view.Modal,
-       AttachmentCompat = wp.media.view.AttachmentCompat,
-       EditImageController = wp.media.controller.EditImage,
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        EditAttachmentMetadata = require( '../../controllers/edit-attachment-metadata.js' ),
-       TwoColumn = require( '../attachment/details-two-column.js' ),
-       DetailsView = require( '../edit-image-details.js' ),
-
</del><span class="cx" style="display: block; padding: 0 10px">         $ = jQuery,
</span><span class="cx" style="display: block; padding: 0 10px">        EditAttachments;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +73,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        createModal: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                // Initialize modal container view.
</span><span class="cx" style="display: block; padding: 0 10px">                if ( this.options.modal ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.modal = new Modal({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.modal = new wp.media.view.Modal({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                                title:      this.options.title
</span><span class="cx" style="display: block; padding: 0 10px">                        });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,7 +102,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        createStates: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                this.states.add([
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new EditAttachmentMetadata( { model: this.model } )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.EditAttachmentMetadata( { model: this.model } )
</ins><span class="cx" style="display: block; padding: 0 10px">                 ]);
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,7 +113,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         *                               should be set with the proper region view.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        editMetadataMode: function( contentRegion ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                contentRegion.view = new TwoColumn({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         contentRegion.view = new wp.media.view.Attachment.Details.TwoColumn({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        model:      this.model
</span><span class="cx" style="display: block; padding: 0 10px">                });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,7 +122,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                 * Attach a subview to display fields added via the
</span><span class="cx" style="display: block; padding: 0 10px">                 * `attachment_fields_to_edit` filter.
</span><span class="cx" style="display: block; padding: 0 10px">                 */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                contentRegion.view.views.set( '.attachment-compat', new AttachmentCompat({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         contentRegion.view.views.set( '.attachment-compat', new wp.media.view.AttachmentCompat({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        model:      this.model
</span><span class="cx" style="display: block; padding: 0 10px">                }) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,7 +140,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         *                               should be set with the proper region view.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        editImageMode: function( contentRegion ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                var editImageController = new EditImageController( {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         var editImageController = new wp.media.controller.EditImage( {
</ins><span class="cx" style="display: block; padding: 0 10px">                         model: this.model,
</span><span class="cx" style="display: block; padding: 0 10px">                        frame: this
</span><span class="cx" style="display: block; padding: 0 10px">                } );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,7 +149,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                editImageController._router = function() {};
</span><span class="cx" style="display: block; padding: 0 10px">                editImageController._menu = function() {};
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                contentRegion.view = new DetailsView( {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         contentRegion.view = new wp.media.view.EditImage.Details( {
</ins><span class="cx" style="display: block; padding: 0 10px">                         model: this.model,
</span><span class="cx" style="display: block; padding: 0 10px">                        frame: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        controller: editImageController
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsframeimagedetailsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/frame/image-details.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/frame/image-details.js       2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/frame/image-details.js 2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,13 +15,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @mixes wp.media.controller.StateMachine
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Select = require( './select.js' ),
-       Toolbar = require( '../toolbar.js' ),
-       ImageDetailsController = require( '../../controllers/image-details.js' ),
-       ReplaceImageController = require( '../../controllers/replace-image.js' ),
-       EditImageController = require( '../../controllers/edit-image.js' ),
-       ImageDetailsView = require( '../image-details.js' ),
-       EditImageView = require( '../edit-image.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Select = wp.media.view.MediaFrame.Select,
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        ImageDetails;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,11 +49,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        createStates: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                this.states.add([
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new ImageDetailsController({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.ImageDetails({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 image: this.image,
</span><span class="cx" style="display: block; padding: 0 10px">                                editable: false
</span><span class="cx" style="display: block; padding: 0 10px">                        }),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new ReplaceImageController({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.ReplaceImage({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 id: 'replace-image',
</span><span class="cx" style="display: block; padding: 0 10px">                                library: wp.media.query( { type: 'image' } ),
</span><span class="cx" style="display: block; padding: 0 10px">                                image: this.image,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,7 +63,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                priority:  80,
</span><span class="cx" style="display: block; padding: 0 10px">                                displaySettings: true
</span><span class="cx" style="display: block; padding: 0 10px">                        }),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new EditImageController( {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.EditImage( {
</ins><span class="cx" style="display: block; padding: 0 10px">                                 image: this.image,
</span><span class="cx" style="display: block; padding: 0 10px">                                selection: this.options.selection
</span><span class="cx" style="display: block; padding: 0 10px">                        } )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,7 +71,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        imageDetailsContent: function( options ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                options.view = new ImageDetailsView({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         options.view = new wp.media.view.ImageDetails({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        model: this.state().image,
</span><span class="cx" style="display: block; padding: 0 10px">                        attachment: this.state().image.attachment
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,7 +87,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        return;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                view = new EditImageView( { model: model, controller: this } ).render();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         view = new wp.media.view.EditImage( { model: model, controller: this } ).render();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                this.content.set( view );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,7 +97,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        renderImageDetailsToolbar: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.toolbar.set( new Toolbar({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.toolbar.set( new wp.media.view.Toolbar({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        items: {
</span><span class="cx" style="display: block; padding: 0 10px">                                select: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +129,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        lastState = frame.lastState(),
</span><span class="cx" style="display: block; padding: 0 10px">                        previous = lastState && lastState.id;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.toolbar.set( new Toolbar({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.toolbar.set( new wp.media.view.Toolbar({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        items: {
</span><span class="cx" style="display: block; padding: 0 10px">                                back: {
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsframemanagejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/frame/manage.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/frame/manage.js      2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/frame/manage.js        2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,12 +16,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @mixes wp.media.controller.StateMachine
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> var MediaFrame = wp.media.view.MediaFrame,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        UploaderWindow = wp.media.view.UploaderWindow,
-       AttachmentsBrowser = wp.media.view.AttachmentsBrowser,
</del><span class="cx" style="display: block; padding: 0 10px">         Library = wp.media.controller.Library,
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        Router = require( '../../routers/manage.js' ),
-
</del><span class="cx" style="display: block; padding: 0 10px">         $ = Backbone.$,
</span><span class="cx" style="display: block; padding: 0 10px">        Manage;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,7 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Initialize a window-wide uploader.
</span><span class="cx" style="display: block; padding: 0 10px">                if ( this.options.uploader ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.uploader = new UploaderWindow({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.uploader = new wp.media.view.UploaderWindow({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                                uploader: {
</span><span class="cx" style="display: block; padding: 0 10px">                                        dropzone:  document.body,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +67,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        this.options.uploader = false;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.gridRouter = new Router();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.gridRouter = new wp.media.view.MediaFrame.Manage.Router();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Call 'initialize' directly on the parent class.
</span><span class="cx" style="display: block; padding: 0 10px">                MediaFrame.prototype.initialize.apply( this, arguments );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,7 +217,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                var state = this.state();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Browse our library of attachments.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.browserView = contentRegion.view = new AttachmentsBrowser({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.browserView = contentRegion.view = new wp.media.view.AttachmentsBrowser({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        collection: state.get('library'),
</span><span class="cx" style="display: block; padding: 0 10px">                        selection:  state.get('selection'),
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsframemediadetailsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/frame/media-details.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/frame/media-details.js       2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/frame/media-details.js 2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,9 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @mixes wp.media.controller.StateMachine
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = wp.media.View,
-       Toolbar = wp.media.view.Toolbar,
-       Select = wp.media.view.MediaFrame.Select,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Select = wp.media.view.MediaFrame.Select,
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        MediaDetails;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,7 +75,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        }
</span><span class="cx" style="display: block; padding: 0 10px">                                }
</span><span class="cx" style="display: block; padding: 0 10px">                        },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        separateCancel: new View({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 separateCancel: new wp.media.View({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 className: 'separator',
</span><span class="cx" style="display: block; padding: 0 10px">                                priority: 40
</span><span class="cx" style="display: block; padding: 0 10px">                        })
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,7 +84,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        setPrimaryButton: function(text, handler) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.toolbar.set( new Toolbar({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.toolbar.set( new wp.media.view.Toolbar({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        items: {
</span><span class="cx" style="display: block; padding: 0 10px">                                button: {
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsframepostjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/frame/post.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/frame/post.js        2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/frame/post.js  2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,24 +14,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @mixes wp.media.controller.StateMachine
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( '../view.js' ),
-       Select = require( './select.js' ),
-       Library = require( '../../controllers/library.js' ),
-       Embed = require( '../embed.js' ),
-       EditImage = require( '../edit-image.js' ),
-       EditSelection = require( '../attachment/edit-selection.js' ),
-       Toolbar = require( '../toolbar.js' ),
-       ToolbarEmbed = require( '../toolbar/embed.js' ),
-       PlaylistSettings = require( '../settings/playlist.js' ),
-       AttachmentsBrowser = require( '../attachments/browser.js' ),
-       SelectionView = require( '../selection.js' ),
-       EmbedController = require( '../../controllers/embed.js' ),
-       EditImageController = require( '../../controllers/edit-image.js' ),
-       GalleryEditController = require( '../../controllers/gallery-edit.js' ),
-       GalleryAddController = require( '../../controllers/gallery-add.js' ),
-       CollectionEditController = require( '../../controllers/collection-edit.js' ),
-       CollectionAddController = require( '../../controllers/collection-add.js' ),
-       FeaturedImageController = require( '../../controllers/featured-image.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Select = wp.media.view.MediaFrame.Select,
+       Library = wp.media.controller.Library,
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        Post;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,18 +89,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        }),
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        // Embed states.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new EmbedController( { metadata: options.metadata } ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.Embed( { metadata: options.metadata } ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new EditImageController( { model: options.editImage } ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.EditImage( { model: options.editImage } ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        // Gallery states.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new GalleryEditController({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.GalleryEdit({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 library: options.selection,
</span><span class="cx" style="display: block; padding: 0 10px">                                editing: options.editing,
</span><span class="cx" style="display: block; padding: 0 10px">                                menu:    'gallery'
</span><span class="cx" style="display: block; padding: 0 10px">                        }),
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new GalleryAddController(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.GalleryAdd(),
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        new Library({
</span><span class="cx" style="display: block; padding: 0 10px">                                id:         'playlist',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,11 +117,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        }),
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        // Playlist states.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new CollectionEditController({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.CollectionEdit({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 type: 'audio',
</span><span class="cx" style="display: block; padding: 0 10px">                                collectionType: 'playlist',
</span><span class="cx" style="display: block; padding: 0 10px">                                title:          l10n.editPlaylistTitle,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                SettingsView:   PlaylistSettings,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         SettingsView:   wp.media.view.Settings.Playlist,
</ins><span class="cx" style="display: block; padding: 0 10px">                                 library:        options.selection,
</span><span class="cx" style="display: block; padding: 0 10px">                                editing:        options.editing,
</span><span class="cx" style="display: block; padding: 0 10px">                                menu:           'playlist',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,7 +129,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                dragInfo:       false
</span><span class="cx" style="display: block; padding: 0 10px">                        }),
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new CollectionAddController({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.CollectionAdd({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 type: 'audio',
</span><span class="cx" style="display: block; padding: 0 10px">                                collectionType: 'playlist',
</span><span class="cx" style="display: block; padding: 0 10px">                                title: l10n.addToPlaylistTitle
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,11 +149,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                }, options.library ) )
</span><span class="cx" style="display: block; padding: 0 10px">                        }),
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new CollectionEditController({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.CollectionEdit({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 type: 'video',
</span><span class="cx" style="display: block; padding: 0 10px">                                collectionType: 'playlist',
</span><span class="cx" style="display: block; padding: 0 10px">                                title:          l10n.editVideoPlaylistTitle,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                SettingsView:   PlaylistSettings,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         SettingsView:   wp.media.view.Settings.Playlist,
</ins><span class="cx" style="display: block; padding: 0 10px">                                 library:        options.selection,
</span><span class="cx" style="display: block; padding: 0 10px">                                editing:        options.editing,
</span><span class="cx" style="display: block; padding: 0 10px">                                menu:           'video-playlist',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,7 +161,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                dragInfo:       false
</span><span class="cx" style="display: block; padding: 0 10px">                        }),
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new CollectionAddController({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.CollectionAdd({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 type: 'video',
</span><span class="cx" style="display: block; padding: 0 10px">                                collectionType: 'playlist',
</span><span class="cx" style="display: block; padding: 0 10px">                                title: l10n.addToVideoPlaylistTitle
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,7 +169,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                ]);
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( wp.media.view.settings.post.featuredImageId ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.states.add( new FeaturedImageController() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.states.add( new wp.media.controller.FeaturedImage() );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,7 +256,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        mainMenu: function( view ) {
</span><span class="cx" style="display: block; padding: 0 10px">                view.set({
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'library-separator': new View({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'library-separator': new wp.media.View({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 className: 'separator',
</span><span class="cx" style="display: block; padding: 0 10px">                                priority: 100
</span><span class="cx" style="display: block; padding: 0 10px">                        })
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -311,7 +295,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        this.controller.modal.focusManager.focus();
</span><span class="cx" style="display: block; padding: 0 10px">                                }
</span><span class="cx" style="display: block; padding: 0 10px">                        },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        separateCancel: new View({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 separateCancel: new wp.media.View({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 className: 'separator',
</span><span class="cx" style="display: block; padding: 0 10px">                                priority: 40
</span><span class="cx" style="display: block; padding: 0 10px">                        })
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -335,7 +319,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        }
</span><span class="cx" style="display: block; padding: 0 10px">                                }
</span><span class="cx" style="display: block; padding: 0 10px">                        },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        separateCancel: new View({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 separateCancel: new wp.media.View({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 className: 'separator',
</span><span class="cx" style="display: block; padding: 0 10px">                                priority: 40
</span><span class="cx" style="display: block; padding: 0 10px">                        })
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -359,7 +343,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        }
</span><span class="cx" style="display: block; padding: 0 10px">                                }
</span><span class="cx" style="display: block; padding: 0 10px">                        },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        separateCancel: new View({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 separateCancel: new wp.media.View({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 className: 'separator',
</span><span class="cx" style="display: block; padding: 0 10px">                                priority: 40
</span><span class="cx" style="display: block; padding: 0 10px">                        })
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -368,7 +352,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        // Content
</span><span class="cx" style="display: block; padding: 0 10px">        embedContent: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                var view = new Embed({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         var view = new wp.media.view.Embed({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        model:      this.state()
</span><span class="cx" style="display: block; padding: 0 10px">                }).render();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -385,7 +369,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        selection = state.get('selection'),
</span><span class="cx" style="display: block; padding: 0 10px">                        view;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                view = new AttachmentsBrowser({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         view = new wp.media.view.AttachmentsBrowser({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        collection: selection,
</span><span class="cx" style="display: block; padding: 0 10px">                        selection:  selection,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -395,7 +379,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        date:       false,
</span><span class="cx" style="display: block; padding: 0 10px">                        dragInfo:   true,
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        AttachmentView: EditSelection
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 AttachmentView: wp.media.view.Attachments.EditSelection
</ins><span class="cx" style="display: block; padding: 0 10px">                 }).render();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                view.toolbar.set( 'backToLibrary', {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -416,7 +400,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        editImageContent: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                var image = this.state().get('image'),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        view = new EditImage( { model: image, controller: this } ).render();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 view = new wp.media.view.EditImage( { model: image, controller: this } ).render();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                this.content.set( view );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -433,7 +417,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        selectionStatusToolbar: function( view ) {
</span><span class="cx" style="display: block; padding: 0 10px">                var editable = this.state().get('editable');
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                view.set( 'selection', new SelectionView({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         view.set( 'selection', new wp.media.view.Selection({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        collection: this.state().get('selection'),
</span><span class="cx" style="display: block; padding: 0 10px">                        priority:   -40,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -574,14 +558,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        mainEmbedToolbar: function( toolbar ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                toolbar.view = new ToolbarEmbed({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         toolbar.view = new wp.media.view.Toolbar.Embed({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this
</span><span class="cx" style="display: block; padding: 0 10px">                });
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        galleryEditToolbar: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                var editing = this.state().get('editing');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.toolbar.set( new Toolbar({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.toolbar.set( new wp.media.view.Toolbar({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        items: {
</span><span class="cx" style="display: block; padding: 0 10px">                                insert: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -610,7 +594,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        galleryAddToolbar: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.toolbar.set( new Toolbar({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.toolbar.set( new wp.media.view.Toolbar({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        items: {
</span><span class="cx" style="display: block; padding: 0 10px">                                insert: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -638,7 +622,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        playlistEditToolbar: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                var editing = this.state().get('editing');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.toolbar.set( new Toolbar({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.toolbar.set( new wp.media.view.Toolbar({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        items: {
</span><span class="cx" style="display: block; padding: 0 10px">                                insert: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -667,7 +651,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        playlistAddToolbar: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.toolbar.set( new Toolbar({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.toolbar.set( new wp.media.view.Toolbar({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        items: {
</span><span class="cx" style="display: block; padding: 0 10px">                                insert: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -695,7 +679,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        videoPlaylistEditToolbar: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                var editing = this.state().get('editing');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.toolbar.set( new Toolbar({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.toolbar.set( new wp.media.view.Toolbar({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        items: {
</span><span class="cx" style="display: block; padding: 0 10px">                                insert: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -724,7 +708,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        videoPlaylistAddToolbar: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.toolbar.set( new Toolbar({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.toolbar.set( new wp.media.view.Toolbar({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        items: {
</span><span class="cx" style="display: block; padding: 0 10px">                                insert: {
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsframeselectjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/frame/select.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/frame/select.js      2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/frame/select.js        2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,11 +14,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @mixes wp.media.controller.StateMachine
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var MediaFrame = require( '../media-frame.js' ),
-       Library = require( '../../controllers/library.js' ),
-       AttachmentsBrowser = require( '../attachments/browser.js' ),
-       UploaderInline = require( '../uploader/inline.js' ),
-       ToolbarSelect = require( '../toolbar/select.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var MediaFrame = wp.media.view.MediaFrame,
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        Select;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +72,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                // Add the default states.
</span><span class="cx" style="display: block; padding: 0 10px">                this.states.add([
</span><span class="cx" style="display: block; padding: 0 10px">                        // Main states.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new Library({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.Library({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 library:   wp.media.query( options.library ),
</span><span class="cx" style="display: block; padding: 0 10px">                                multiple:  options.multiple,
</span><span class="cx" style="display: block; padding: 0 10px">                                title:     options.title,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,7 +123,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                this.$el.removeClass('hide-toolbar');
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Browse our library of attachments.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                contentRegion.view = new AttachmentsBrowser({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         contentRegion.view = new wp.media.view.AttachmentsBrowser({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        collection: state.get('library'),
</span><span class="cx" style="display: block; padding: 0 10px">                        selection:  state.get('selection'),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,7 +147,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        uploadContent: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                this.$el.removeClass( 'hide-toolbar' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.content.set( new UploaderInline({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.content.set( new wp.media.view.UploaderInline({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this
</span><span class="cx" style="display: block; padding: 0 10px">                }) );
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,7 +163,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                options = options || this.options.button || {};
</span><span class="cx" style="display: block; padding: 0 10px">                options.controller = this;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                toolbar.view = new ToolbarSelect( options );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         toolbar.view = new wp.media.view.Toolbar.Select( options );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsframevideodetailsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/frame/video-details.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/frame/video-details.js       2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/frame/video-details.js 2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,8 +15,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> var MediaDetails = wp.media.view.MediaFrame.MediaDetails,
</span><span class="cx" style="display: block; padding: 0 10px">        MediaLibrary = wp.media.controller.MediaLibrary,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        VideoDetailsView = require( '../video-details.js' ),
-       VideoDetailsController = require( '../../controllers/video-details.js' ),
</del><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        VideoDetails;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        initialize: function( options ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                options.DetailsView = VideoDetailsView;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         options.DetailsView = wp.media.view.VideoDetails;
</ins><span class="cx" style="display: block; padding: 0 10px">                 options.cancelText = l10n.videoDetailsCancel;
</span><span class="cx" style="display: block; padding: 0 10px">                options.addText = l10n.videoAddSourceTitle;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +49,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        createStates: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                this.states.add([
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new VideoDetailsController({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.VideoDetails({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 media: this.media
</span><span class="cx" style="display: block; padding: 0 10px">                        }),
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsframejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/frame.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/frame.js     2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/frame.js       2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,13 +15,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @mixes wp.media.controller.StateMachine
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var StateMachine = require( '../controllers/state-machine.js' ),
-       State = require( '../controllers/state.js' ),
-       Region = require( '../controllers/region.js' ),
-       View = require( './view.js' ),
-       Frame;
-
-Frame = View.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Frame = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         initialize: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                _.defaults( this.options, {
</span><span class="cx" style="display: block; padding: 0 10px">                        mode: [ 'select' ]
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Initialize regions.
</span><span class="cx" style="display: block; padding: 0 10px">                _.each( this.regions, function( region ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this[ region ] = new Region({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this[ region ] = new wp.media.controller.Region({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 view:     this,
</span><span class="cx" style="display: block; padding: 0 10px">                                id:       region,
</span><span class="cx" style="display: block; padding: 0 10px">                                selector: '.media-frame-' + region
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,7 +49,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        _createStates: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                // Create the default `states` collection.
</span><span class="cx" style="display: block; padding: 0 10px">                this.states = new Backbone.Collection( null, {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        model: State
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 model: wp.media.controller.State
</ins><span class="cx" style="display: block; padding: 0 10px">                 });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Ensure states have a reference to the frame.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,6 +161,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> // Make the `Frame` a `StateMachine`.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-_.extend( Frame.prototype, StateMachine.prototype );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+_.extend( Frame.prototype, wp.media.controller.StateMachine.prototype );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Frame;
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsiframejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/iframe.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/iframe.js    2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/iframe.js      2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,10 +6,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       Iframe;
-
-Iframe = View.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Iframe = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         className: 'media-iframe',
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><span class="cx" style="display: block; padding: 0 10px">         * @returns {wp.media.view.Iframe} Returns itself to allow chaining
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsimagedetailsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/image-details.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/image-details.js     2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/image-details.js       2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var AttachmentDisplay = require( './settings/attachment-display.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var AttachmentDisplay = wp.media.view.Settings.AttachmentDisplay,
</ins><span class="cx" style="display: block; padding: 0 10px">         $ = jQuery,
</span><span class="cx" style="display: block; padding: 0 10px">        ImageDetails;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewslabeljs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/label.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/label.js     2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/label.js       2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,10 +6,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       Label;
-
-Label = View.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Label = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         tagName: 'label',
</span><span class="cx" style="display: block; padding: 0 10px">        className: 'screen-reader-text',
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsmediaframejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/media-frame.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/media-frame.js       2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/media-frame.js 2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,14 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @mixes wp.media.controller.StateMachine
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       Frame = require( './frame.js' ),
-       Modal = require( './modal.js' ),
-       UploaderWindow = require( './uploader/window.js' ),
-       Menu = require( './menu.js' ),
-       Toolbar = require( './toolbar.js' ),
-       Router = require( './router.js' ),
-       Iframe = require( './iframe.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Frame = wp.media.view.Frame,
</ins><span class="cx" style="display: block; padding: 0 10px">         $ = jQuery,
</span><span class="cx" style="display: block; padding: 0 10px">        MediaFrame;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +42,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Initialize modal container view.
</span><span class="cx" style="display: block; padding: 0 10px">                if ( this.options.modal ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.modal = new Modal({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.modal = new wp.media.view.Modal({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                                title:      this.options.title
</span><span class="cx" style="display: block; padding: 0 10px">                        });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +58,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Initialize window-wide uploader.
</span><span class="cx" style="display: block; padding: 0 10px">                if ( this.options.uploader ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.uploader = new UploaderWindow({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.uploader = new wp.media.view.UploaderWindow({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                                uploader: {
</span><span class="cx" style="display: block; padding: 0 10px">                                        dropzone:  this.modal ? this.modal.$el : this.$el,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,7 +99,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @this wp.media.controller.Region
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        createTitle: function( title ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                title.view = new View({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         title.view = new wp.media.View({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        tagName: 'h1'
</span><span class="cx" style="display: block; padding: 0 10px">                });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,7 +109,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @this wp.media.controller.Region
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        createMenu: function( menu ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                menu.view = new Menu({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         menu.view = new wp.media.view.Menu({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this
</span><span class="cx" style="display: block; padding: 0 10px">                });
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,7 +123,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @this wp.media.controller.Region
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        createToolbar: function( toolbar ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                toolbar.view = new Toolbar({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         toolbar.view = new wp.media.view.Toolbar({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this
</span><span class="cx" style="display: block; padding: 0 10px">                });
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +132,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @this wp.media.controller.Region
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        createRouter: function( router ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                router.view = new Router({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         router.view = new wp.media.view.Router({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this
</span><span class="cx" style="display: block; padding: 0 10px">                });
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -186,7 +179,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        iframeContent: function( content ) {
</span><span class="cx" style="display: block; padding: 0 10px">                this.$el.addClass('hide-toolbar');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                content.view = new Iframe({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         content.view = new wp.media.view.Iframe({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this
</span><span class="cx" style="display: block; padding: 0 10px">                });
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsmenuitemjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/menu-item.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/menu-item.js 2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/menu-item.js   2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,11 +8,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       $ = jQuery,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var $ = jQuery,
</ins><span class="cx" style="display: block; padding: 0 10px">         MenuItem;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-MenuItem = View.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+MenuItem = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         tagName:   'a',
</span><span class="cx" style="display: block; padding: 0 10px">        className: 'media-menu-item',
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsmenujs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/menu.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/menu.js      2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/menu.js        2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,8 +7,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var MenuItem = require( './menu-item.js' ),
-       PriorityList = require( './priority-list.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var MenuItem = wp.media.view.MenuItem,
+       PriorityList = wp.media.view.PriorityList,
</ins><span class="cx" style="display: block; padding: 0 10px">         Menu;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> Menu = PriorityList.extend({
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsmodaljs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/modal.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/modal.js     2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/modal.js       2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,12 +10,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       FocusManager = require( './focus-manager.js' ),
-       $ = jQuery,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var $ = jQuery,
</ins><span class="cx" style="display: block; padding: 0 10px">         Modal;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Modal = View.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Modal = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         tagName:  'div',
</span><span class="cx" style="display: block; padding: 0 10px">        template: wp.template('media-modal'),
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,7 +34,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        freeze:    true
</span><span class="cx" style="display: block; padding: 0 10px">                });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.focusManager = new FocusManager({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.focusManager = new wp.media.view.FocusManager({
</ins><span class="cx" style="display: block; padding: 0 10px">                         el: this.el
</span><span class="cx" style="display: block; padding: 0 10px">                });
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsprioritylistjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/priority-list.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/priority-list.js     2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/priority-list.js       2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,10 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       PriorityList;
-
-PriorityList = View.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var PriorityList = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         tagName:   'div',
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        initialize: function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,7 +90,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @returns {wp.media.View}
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        toView: function( options ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return new View( options );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return new wp.media.View( options );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsrouteritemjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/router-item.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/router-item.js       2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/router-item.js 2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,10 +7,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var MenuItem = require( './menu-item.js' ),
-       RouterItem;
-
-RouterItem = MenuItem.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var RouterItem = wp.media.view.MenuItem.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         /**
</span><span class="cx" style="display: block; padding: 0 10px">         * On click handler to activate the content region's corresponding mode.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsrouterjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/router.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/router.js    2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/router.js      2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,3 +1,5 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/*globals wp */
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * wp.media.view.Router
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,15 +10,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Menu = require( './menu.js' ),
-       RouterItem = require( './router-item.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Menu = wp.media.view.Menu,
</ins><span class="cx" style="display: block; padding: 0 10px">         Router;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> Router = Menu.extend({
</span><span class="cx" style="display: block; padding: 0 10px">        tagName:   'div',
</span><span class="cx" style="display: block; padding: 0 10px">        className: 'media-router',
</span><span class="cx" style="display: block; padding: 0 10px">        property:  'contentMode',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        ItemView:  RouterItem,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ItemView:  wp.media.view.RouterItem,
</ins><span class="cx" style="display: block; padding: 0 10px">         region:    'router',
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        initialize: function() {
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewssearchjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/search.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/search.js    2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/search.js      2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,11 +8,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       l10n = wp.media.view.l10n,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var l10n = wp.media.view.l10n,
</ins><span class="cx" style="display: block; padding: 0 10px">         Search;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Search = View.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Search = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         tagName:   'input',
</span><span class="cx" style="display: block; padding: 0 10px">        className: 'search',
</span><span class="cx" style="display: block; padding: 0 10px">        id:        'media-search-input',
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsselectionjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/selection.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/selection.js 2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/selection.js   2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,12 +8,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       AttachmentsSelection = require( './attachments/selection.js' ),
-       l10n = wp.media.view.l10n,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var l10n = wp.media.view.l10n,
</ins><span class="cx" style="display: block; padding: 0 10px">         Selection;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Selection = View.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Selection = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         tagName:   'div',
</span><span class="cx" style="display: block; padding: 0 10px">        className: 'media-selection',
</span><span class="cx" style="display: block; padding: 0 10px">        template:  wp.template('media-selection'),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +30,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                /**
</span><span class="cx" style="display: block; padding: 0 10px">                 * @member {wp.media.view.Attachments.Selection}
</span><span class="cx" style="display: block; padding: 0 10px">                 */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.attachments = new AttachmentsSelection({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.attachments = new wp.media.view.Attachments.Selection({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this.controller,
</span><span class="cx" style="display: block; padding: 0 10px">                        collection: this.collection,
</span><span class="cx" style="display: block; padding: 0 10px">                        selection:  this.collection,
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewssettingsattachmentdisplayjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/settings/attachment-display.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/settings/attachment-display.js       2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/settings/attachment-display.js 2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Settings = require( '../settings.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Settings = wp.media.view.Settings,
</ins><span class="cx" style="display: block; padding: 0 10px">         AttachmentDisplay;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> AttachmentDisplay = Settings.extend({
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewssettingsgalleryjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/settings/gallery.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/settings/gallery.js  2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/settings/gallery.js    2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,10 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Settings = require( '../settings.js' ),
-       Gallery;
-
-Gallery = Settings.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Gallery = wp.media.view.Settings.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         className: 'collection-settings gallery-settings',
</span><span class="cx" style="display: block; padding: 0 10px">        template:  wp.template('gallery-settings')
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewssettingsplaylistjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/settings/playlist.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/settings/playlist.js 2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/settings/playlist.js   2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,10 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Settings = require( '../settings.js' ),
-       Playlist;
-
-Playlist = Settings.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Playlist = wp.media.view.Settings.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         className: 'collection-settings playlist-settings',
</span><span class="cx" style="display: block; padding: 0 10px">        template:  wp.template('playlist-settings')
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewssettingsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/settings.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/settings.js  2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/settings.js    2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var View = wp.media.View,
</ins><span class="cx" style="display: block; padding: 0 10px">         $ = Backbone.$,
</span><span class="cx" style="display: block; padding: 0 10px">        Settings;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewssidebarjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/sidebar.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/sidebar.js   2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/sidebar.js     2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,10 +7,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var PriorityList = require( './priority-list.js' ),
-       Sidebar;
-
-Sidebar = PriorityList.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Sidebar = wp.media.view.PriorityList.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         className: 'media-sidebar'
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsspinnerjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/spinner.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/spinner.js   2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/spinner.js     2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,10 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       Spinner;
-
-Spinner = View.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Spinner = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         tagName:   'span',
</span><span class="cx" style="display: block; padding: 0 10px">        className: 'spinner',
</span><span class="cx" style="display: block; padding: 0 10px">        spinnerTimeout: false,
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewstoolbarembedjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/toolbar/embed.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/toolbar/embed.js     2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/toolbar/embed.js       2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Select = require( './select.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Select = wp.media.view.Toolbar.Select,
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        Embed;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewstoolbarselectjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/toolbar/select.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/toolbar/select.js    2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/toolbar/select.js      2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Toolbar = require( '../toolbar.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Toolbar = wp.media.view.Toolbar,
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        Select;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewstoolbarjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/toolbar.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/toolbar.js   2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/toolbar.js     2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,9 +11,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       Button = require( './button.js' ),
-       PriorityList = require( './priority-list.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var View = wp.media.View,
</ins><span class="cx" style="display: block; padding: 0 10px">         Toolbar;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> Toolbar = View.extend({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,8 +26,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                this._views = {};
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // The toolbar is composed of two `PriorityList` views.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.primary   = new PriorityList();
-               this.secondary = new PriorityList();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.primary   = new wp.media.view.PriorityList();
+               this.secondary = new wp.media.view.PriorityList();
</ins><span class="cx" style="display: block; padding: 0 10px">                 this.primary.$el.addClass('media-toolbar-primary search-form');
</span><span class="cx" style="display: block; padding: 0 10px">                this.secondary.$el.addClass('media-toolbar-secondary');
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +89,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                } else {
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! ( view instanceof Backbone.View ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                view.classes = [ 'media-button-' + id ].concat( view.classes || [] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                view = new Button( view ).render();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         view = new wp.media.view.Button( view ).render();
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        view.controller = view.controller || this.controller;
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsuploadereditorjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/uploader/editor.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/uploader/editor.js   2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/uploader/editor.js     2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( '../view.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var View = wp.media.View,
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        $ = jQuery,
</span><span class="cx" style="display: block; padding: 0 10px">        EditorUploader;
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsuploaderinlinejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/uploader/inline.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/uploader/inline.js   2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/uploader/inline.js     2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,8 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( '../view.js' ),
-       UploaderStatus = require( './status.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var View = wp.media.View,
</ins><span class="cx" style="display: block; padding: 0 10px">         UploaderInline;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> UploaderInline = View.extend({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +38,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( this.options.status ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.views.set( '.upload-inline-status', new UploaderStatus({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.views.set( '.upload-inline-status', new wp.media.view.UploaderStatus({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 controller: this.controller
</span><span class="cx" style="display: block; padding: 0 10px">                        }) );
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsuploaderstatuserrorjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/uploader/status-error.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/uploader/status-error.js     2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/uploader/status-error.js       2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,10 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( '../view.js' ),
-       UploaderStatusError;
-
-UploaderStatusError = View.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var UploaderStatusError = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         className: 'upload-error',
</span><span class="cx" style="display: block; padding: 0 10px">        template:  wp.template('uploader-status-error')
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsuploaderstatusjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/uploader/status.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/uploader/status.js   2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/uploader/status.js     2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,8 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( '../view.js' ),
-       UploaderStatusError = require( './status-error.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var View = wp.media.View,
</ins><span class="cx" style="display: block; padding: 0 10px">         UploaderStatus;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> UploaderStatus = View.extend({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,7 +112,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @param {Backbone.Model} error
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        error: function( error ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.views.add( '.upload-errors', new UploaderStatusError({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.views.add( '.upload-errors', new wp.media.view.UploaderStatusError({
</ins><span class="cx" style="display: block; padding: 0 10px">                         filename: this.filename( error.get('file').name ),
</span><span class="cx" style="display: block; padding: 0 10px">                        message:  error.get('message')
</span><span class="cx" style="display: block; padding: 0 10px">                }), { at: 0 });
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsuploaderwindowjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/uploader/window.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/uploader/window.js   2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/uploader/window.js     2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,11 +16,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {jQuery} [options.uploader.dropzone] jQuery collection of the dropzone.
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {object} [options.uploader.params]
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( '../view.js' ),
-       $ = jQuery,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var $ = jQuery,
</ins><span class="cx" style="display: block; padding: 0 10px">         UploaderWindow;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-UploaderWindow = View.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+UploaderWindow = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         tagName:   'div',
</span><span class="cx" style="display: block; padding: 0 10px">        className: 'uploader-window',
</span><span class="cx" style="display: block; padding: 0 10px">        template:  wp.template('uploader-window'),
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsvideodetailsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/video-details.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/video-details.js     2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views/video-details.js       2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var MediaDetails = require( './media-details' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var MediaDetails = wp.media.view.MediaDetails,
</ins><span class="cx" style="display: block; padding: 0 10px">         VideoDetails;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> VideoDetails = MediaDetails.extend({
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views.js   2015-03-30 22:48:11 UTC (rev 31934)
+++ trunk/src/wp-includes/js/media/views.js     2015-03-31 02:02:35 UTC (rev 31935)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,7 +35,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {string}                     attributes.collectionType         The collection type. (e.g. 'playlist').
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> var Selection = wp.media.model.Selection,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        Library = require( './library.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ Library = wp.media.controller.Library,
</ins><span class="cx" style="display: block; padding: 0 10px">         CollectionAdd;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> CollectionAdd = Library.extend({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +101,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = CollectionAdd;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./library.js":10}],2:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],2:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp, Backbone */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,9 +138,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {string}                     attributes.type                   The collection's media type. (e.g. 'video').
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {string}                     attributes.collectionType         The collection type. (e.g. 'playlist').
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Library = require( './library.js' ),
-       View = require( '../views/view.js' ),
-       EditLibraryView = require( '../views/attachment/edit-library.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Library = wp.media.controller.Library,
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        $ = jQuery,
</span><span class="cx" style="display: block; padding: 0 10px">        CollectionEdit;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,7 +177,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px">                // The single `Attachment` view to be used in the `Attachments` view.
</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! this.get('AttachmentView') ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.set( 'AttachmentView', EditLibraryView );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.set( 'AttachmentView', wp.media.view.Attachment.EditLibrary );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px">                Library.prototype.initialize.apply( this, arguments );
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,7 +243,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                attachmentsBrowserView.sidebar.set( obj );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( dragInfoText ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        attachmentsBrowserView.toolbar.set( 'dragInfo', new View({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 attachmentsBrowserView.toolbar.set( 'dragInfo', new wp.media.View({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 el: $( '<div class="instructions">' + dragInfoText + '</div>' )[0],
</span><span class="cx" style="display: block; padding: 0 10px">                                priority: -40
</span><span class="cx" style="display: block; padding: 0 10px">                        }) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,7 +263,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = CollectionEdit;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"../views/attachment/edit-library.js":25,"../views/view.js":71,"./library.js":10}],3:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],3:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp, _, Backbone */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -277,13 +275,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.media.controller.State
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.Model
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var State = require( './state.js' ),
-       ToolbarView = require( '../views/toolbar.js' ),
-       CropperView = require( '../views/cropper.js' ),
-       l10n = wp.media.view.l10n,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var l10n = wp.media.view.l10n,
</ins><span class="cx" style="display: block; padding: 0 10px">         Cropper;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Cropper = State.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Cropper = wp.media.controller.State.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         defaults: {
</span><span class="cx" style="display: block; padding: 0 10px">                id:          'cropper',
</span><span class="cx" style="display: block; padding: 0 10px">                title:       l10n.cropImage,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,7 +301,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        createCropContent: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.cropperView = new CropperView({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.cropperView = new wp.media.view.Cropper({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        attachment: this.get('selection').first()
</span><span class="cx" style="display: block; padding: 0 10px">                });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -372,7 +367,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        });
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.frame.toolbar.set( new ToolbarView(toolbarOptions) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.frame.toolbar.set( new wp.media.view.Toolbar(toolbarOptions) );
</ins><span class="cx" style="display: block; padding: 0 10px">         },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        doCrop: function( attachment ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -386,7 +381,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Cropper;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"../views/cropper.js":34,"../views/toolbar.js":63,"./state.js":15}],4:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],4:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -407,12 +402,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {string}                    [attributes.menu=false]         Initial mode for the menu region.
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {string}                    [attributes.url]                Unused. @todo Consider removal.
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var State = require( './state.js' ),
-       ToolbarView = require( '../views/toolbar.js' ),
-       l10n = wp.media.view.l10n,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var l10n = wp.media.view.l10n,
</ins><span class="cx" style="display: block; padding: 0 10px">         EditImage;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-EditImage = State.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+EditImage = wp.media.controller.State.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         defaults: {
</span><span class="cx" style="display: block; padding: 0 10px">                id:      'edit-image',
</span><span class="cx" style="display: block; padding: 0 10px">                title:   l10n.editImage,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -444,7 +437,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        lastState = frame.lastState(),
</span><span class="cx" style="display: block; padding: 0 10px">                        previous = lastState && lastState.id;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                frame.toolbar.set( new ToolbarView({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         frame.toolbar.set( new wp.media.view.Toolbar({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: frame,
</span><span class="cx" style="display: block; padding: 0 10px">                        items: {
</span><span class="cx" style="display: block; padding: 0 10px">                                back: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -466,7 +459,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = EditImage;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"../views/toolbar.js":63,"./state.js":15}],5:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],5:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp, _, Backbone */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -490,12 +483,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {string} [attributes.url]                   The embed URL.
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {object} [attributes.metadata={}]           Properties of the embed, which will override attributes.url if set.
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var State = require( './state.js' ),
-       l10n = wp.media.view.l10n,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var l10n = wp.media.view.l10n,
</ins><span class="cx" style="display: block; padding: 0 10px">         $ = Backbone.$,
</span><span class="cx" style="display: block; padding: 0 10px">        Embed;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Embed = State.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Embed = wp.media.controller.State.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         defaults: {
</span><span class="cx" style="display: block; padding: 0 10px">                id:       'embed',
</span><span class="cx" style="display: block; padding: 0 10px">                title:    l10n.insertFromUrlTitle,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -605,7 +597,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Embed;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./state.js":15}],6:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],6:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp, _ */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -640,7 +632,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {boolean}                    [attributes.syncSelection=true]       Whether the Attachments selection should be persisted from the last state.
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> var Attachment = wp.media.model.Attachment,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        Library = require( './library.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ Library = wp.media.controller.Library,
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        FeaturedImage;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -729,7 +721,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = FeaturedImage;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./library.js":10}],7:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],7:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp, _ */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -764,7 +756,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  *                                                                          Defaults to false because for this state, because the library of the Edit Gallery state is the selection.
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> var Selection = wp.media.model.Selection,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        Library = require( './library.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ Library = wp.media.controller.Library,
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        GalleryAdd;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -822,7 +814,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = GalleryAdd;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./library.js":10}],8:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],8:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -856,9 +848,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {view}                       [attributes.AttachmentView]        The single `Attachment` view to be used in the `Attachments`.
</span><span class="cx" style="display: block; padding: 0 10px">  *                                                                        If none supplied, defaults to wp.media.view.Attachment.EditLibrary.
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Library = require( './library.js' ),
-       EditLibraryView = require( '../views/attachment/edit-library.js' ),
-       GallerySettingsView = require( '../views/settings/gallery.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Library = wp.media.controller.Library,
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        GalleryEdit;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -892,7 +882,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // The single `Attachment` view to be used in the `Attachments` view.
</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! this.get('AttachmentView') ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.set( 'AttachmentView', EditLibraryView );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.set( 'AttachmentView', wp.media.view.Attachment.EditLibrary );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                Library.prototype.initialize.apply( this, arguments );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -946,7 +936,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                library.gallery = library.gallery || new Backbone.Model();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                browser.sidebar.set({
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        gallery: new GallerySettingsView({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 gallery: new wp.media.view.Settings.Gallery({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                                model:      library.gallery,
</span><span class="cx" style="display: block; padding: 0 10px">                                priority:   40
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -966,7 +956,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = GalleryEdit;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"../views/attachment/edit-library.js":25,"../views/settings/gallery.js":59,"./library.js":10}],9:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],9:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp, _ */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -993,8 +983,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @todo This state inherits some defaults from media.controller.Library.prototype.defaults,
</span><span class="cx" style="display: block; padding: 0 10px">  *       however this may not do anything.
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var State = require( './state.js' ),
-       Library = require( './library.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var State = wp.media.controller.State,
+       Library = wp.media.controller.Library,
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        ImageDetails;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1030,7 +1020,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = ImageDetails;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./library.js":10,"./state.js":15}],10:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],10:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp, _, Backbone */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1067,14 +1057,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {boolean}                         [attributes.contentUserSetting=true] Whether the content region's mode should be set and persisted per user.
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {boolean}                         [attributes.syncSelection=true]      Whether the Attachments selection should be persisted from the last state.
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var selectionSync = require( '../utils/selection-sync.js' ),
-       State = require( './state.js' ),
-       l10n = wp.media.view.l10n,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var l10n = wp.media.view.l10n,
</ins><span class="cx" style="display: block; padding: 0 10px">         getUserSetting = window.getUserSetting,
</span><span class="cx" style="display: block; padding: 0 10px">        setUserSetting = window.setUserSetting,
</span><span class="cx" style="display: block; padding: 0 10px">        Library;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Library = State.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Library = wp.media.controller.State.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         defaults: {
</span><span class="cx" style="display: block; padding: 0 10px">                id:                 'library',
</span><span class="cx" style="display: block; padding: 0 10px">                title:              l10n.mediaLibraryTitle,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1302,11 +1290,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> // Make selectionSync available on any Media Library state.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-_.extend( Library.prototype, selectionSync );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+_.extend( Library.prototype, wp.media.selectionSync );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Library;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"../utils/selection-sync.js":16,"./state.js":15}],11:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],11:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp, _ */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1317,7 +1305,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.media.controller.State
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.Model
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Library = require( './library.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Library = wp.media.controller.Library,
</ins><span class="cx" style="display: block; padding: 0 10px">         MediaLibrary;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> MediaLibrary = Library.extend({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1358,7 +1346,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = MediaLibrary;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./library.js":10}],12:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],12:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals Backbone, _ */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1573,7 +1561,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {boolean}                    [attributes.contentUserSetting=true] Whether the content region's mode should be set and persisted per user.
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {boolean}                    [attributes.syncSelection=true]      Whether the Attachments selection should be persisted from the last state.
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Library = require( './library.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Library = wp.media.controller.Library,
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        ReplaceImage;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1649,7 +1637,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = ReplaceImage;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./library.js":10}],14:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],14:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals _, Backbone */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2248,7 +2236,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var View = wp.media.View,
</ins><span class="cx" style="display: block; padding: 0 10px">         AttachmentCompat;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> AttachmentCompat = View.extend({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2322,7 +2310,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = AttachmentCompat;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./view.js":71}],19:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],19:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals _, jQuery */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2333,11 +2321,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       $ = jQuery,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var $ = jQuery,
</ins><span class="cx" style="display: block; padding: 0 10px">         AttachmentFilters;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-AttachmentFilters = View.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+AttachmentFilters = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         tagName:   'select',
</span><span class="cx" style="display: block; padding: 0 10px">        className: 'attachment-filters',
</span><span class="cx" style="display: block; padding: 0 10px">        id:        'media-attachment-filters',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2402,7 +2389,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = AttachmentFilters;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./view.js":71}],20:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],20:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2414,11 +2401,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var AttachmentFilters = require( '../attachment-filters.js' ),
-       l10n = wp.media.view.l10n,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var l10n = wp.media.view.l10n,
</ins><span class="cx" style="display: block; padding: 0 10px">         All;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-All = AttachmentFilters.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+All = wp.media.view.AttachmentFilters.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         createFilters: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                var filters = {};
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2495,7 +2481,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = All;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"../attachment-filters.js":19}],21:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],21:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp, _ */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2507,11 +2493,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var AttachmentFilters = require( '../attachment-filters.js' ),
-       l10n = wp.media.view.l10n,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var l10n = wp.media.view.l10n,
</ins><span class="cx" style="display: block; padding: 0 10px">         DateFilter;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-DateFilter = AttachmentFilters.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+DateFilter = wp.media.view.AttachmentFilters.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         id: 'media-attachment-date-filters',
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        createFilters: function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2539,7 +2524,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = DateFilter;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"../attachment-filters.js":19}],22:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],22:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2551,11 +2536,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var AttachmentFilters = require( '../attachment-filters.js' ),
-       l10n = wp.media.view.l10n,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var l10n = wp.media.view.l10n,
</ins><span class="cx" style="display: block; padding: 0 10px">         Uploaded;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Uploaded = AttachmentFilters.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Uploaded = wp.media.view.AttachmentFilters.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         createFilters: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                var type = this.model.get('type'),
</span><span class="cx" style="display: block; padding: 0 10px">                        types = wp.media.view.settings.mimeTypes,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2601,7 +2585,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Uploaded;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"../attachment-filters.js":19}],23:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],23:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp, _, jQuery */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2612,7 +2596,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var View = wp.media.View,
</ins><span class="cx" style="display: block; padding: 0 10px">         $ = jQuery,
</span><span class="cx" style="display: block; padding: 0 10px">        Attachment;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3158,7 +3142,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Attachment;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./view.js":71}],24:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],24:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp, _ */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3170,7 +3154,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Attachment = require( '../attachment.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Attachment = wp.media.view.Attachment,
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        Details;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3315,7 +3299,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Details;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"../attachment.js":23}],25:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],25:[function(require,module,exports){
+/*globals wp */
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * wp.media.view.Attachment.EditLibrary
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3325,10 +3311,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Attachment = require( '../attachment.js' ),
-       EditLibrary;
-
-EditLibrary = Attachment.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var EditLibrary = wp.media.view.Attachment.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         buttons: {
</span><span class="cx" style="display: block; padding: 0 10px">                close: true
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3336,7 +3319,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = EditLibrary;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"../attachment.js":23}],26:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],26:[function(require,module,exports){
+/*globals wp */
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * wp.media.view.Attachments.EditSelection
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3347,10 +3332,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Selection = require( './selection.js' ),
-       EditSelection;
-
-EditSelection = Selection.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var EditSelection = wp.media.view.Attachment.Selection.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         buttons: {
</span><span class="cx" style="display: block; padding: 0 10px">                close: true
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3358,7 +3340,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = EditSelection;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./selection.js":28}],27:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],27:[function(require,module,exports){
+/*globals wp */
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * wp.media.view.Attachment.Library
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3368,10 +3352,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Attachment = require( '../attachment.js' ),
-       Library;
-
-Library = Attachment.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Library = wp.media.view.Attachment.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         buttons: {
</span><span class="cx" style="display: block; padding: 0 10px">                check: true
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3379,7 +3360,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Library;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"../attachment.js":23}],28:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],28:[function(require,module,exports){
+/*globals wp */
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * wp.media.view.Attachment.Selection
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3389,10 +3372,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Attachment = require( '../attachment.js' ),
-       Selection;
-
-Selection = Attachment.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Selection = wp.media.view.Attachment.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         className: 'attachment selection',
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        // On click, just select the model, instead of removing the model from
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3404,7 +3384,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Selection;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"../attachment.js":23}],29:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],29:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp, _, jQuery */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3415,8 +3395,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       Attachment = require( './attachment.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var View = wp.media.View,
</ins><span class="cx" style="display: block; padding: 0 10px">         $ = jQuery,
</span><span class="cx" style="display: block; padding: 0 10px">        Attachments;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3434,7 +3413,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                _.defaults( this.options, {
</span><span class="cx" style="display: block; padding: 0 10px">                        refreshSensitivity: wp.media.isTouchDevice ? 300 : 200,
</span><span class="cx" style="display: block; padding: 0 10px">                        refreshThreshold:   3,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        AttachmentView:     Attachment,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 AttachmentView:     wp.media.view.Attachment,
</ins><span class="cx" style="display: block; padding: 0 10px">                         sortable:           false,
</span><span class="cx" style="display: block; padding: 0 10px">                        resize:             true,
</span><span class="cx" style="display: block; padding: 0 10px">                        idealColumnWidth:   $( window ).width() < 640 ? 135 : 150
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3706,7 +3685,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Attachments;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./attachment.js":23,"./view.js":71}],30:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],30:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp, _, jQuery */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3729,22 +3708,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @param {bool|string} [options.sidebar=true]  Whether to create a sidebar for the browser.
</span><span class="cx" style="display: block; padding: 0 10px">  *                                              Accepts true, false, and 'errors'.
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( '../view.js' ),
-       Library = require( '../attachment/library.js' ),
-       Toolbar = require( '../toolbar.js' ),
-       Spinner = require( '../spinner.js' ),
-       Search = require( '../search.js' ),
-       Label = require( '../label.js' ),
-       Uploaded = require( '../attachment-filters/uploaded.js' ),
-       All = require( '../attachment-filters/all.js' ),
-       DateFilter = require( '../attachment-filters/date.js' ),
-       UploaderInline = require( '../uploader/inline.js' ),
-       Attachments = require( '../attachments.js' ),
-       Sidebar = require( '../sidebar.js' ),
-       UploaderStatus = require( '../uploader/status.js' ),
-       Details = require( '../attachment/details.js' ),
-       AttachmentCompat = require( '../attachment-compat.js' ),
-       AttachmentDisplay = require( '../settings/attachment-display.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var View = wp.media.View,
</ins><span class="cx" style="display: block; padding: 0 10px">         mediaTrash = wp.media.view.settings.mediaTrash,
</span><span class="cx" style="display: block; padding: 0 10px">        l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        $ = jQuery,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3761,7 +3725,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        date:    true,
</span><span class="cx" style="display: block; padding: 0 10px">                        display: false,
</span><span class="cx" style="display: block; padding: 0 10px">                        sidebar: true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        AttachmentView: Library
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 AttachmentView: wp.media.view.Attachment.Library
</ins><span class="cx" style="display: block; padding: 0 10px">                 });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                this.listenTo( this.controller, 'toggle:upload:attachment', _.bind( this.toggleUploader, this ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3812,18 +3776,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">                /**
</span><span class="cx" style="display: block; padding: 0 10px">                * @member {wp.media.view.Toolbar}
</span><span class="cx" style="display: block; padding: 0 10px">                */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.toolbar = new Toolbar( toolbarOptions );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.toolbar = new wp.media.view.Toolbar( toolbarOptions );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                this.views.add( this.toolbar );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.toolbar.set( 'spinner', new Spinner({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.toolbar.set( 'spinner', new wp.media.view.Spinner({
</ins><span class="cx" style="display: block; padding: 0 10px">                         priority: -60
</span><span class="cx" style="display: block; padding: 0 10px">                }) );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( -1 !== $.inArray( this.options.filters, [ 'uploaded', 'all' ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        // "Filters" will return a <select>, need to render
</span><span class="cx" style="display: block; padding: 0 10px">                        // screen reader text before
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.toolbar.set( 'filtersLabel', new Label({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.toolbar.set( 'filtersLabel', new wp.media.view.Label({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 value: l10n.filterByType,
</span><span class="cx" style="display: block; padding: 0 10px">                                attributes: {
</span><span class="cx" style="display: block; padding: 0 10px">                                        'for':  'media-attachment-filters'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3832,13 +3796,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        }).render() );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( 'uploaded' === this.options.filters ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                this.toolbar.set( 'filters', new Uploaded({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         this.toolbar.set( 'filters', new wp.media.view.AttachmentFilters.Uploaded({
</ins><span class="cx" style="display: block; padding: 0 10px">                                         controller: this.controller,
</span><span class="cx" style="display: block; padding: 0 10px">                                        model:      this.collection.props,
</span><span class="cx" style="display: block; padding: 0 10px">                                        priority:   -80
</span><span class="cx" style="display: block; padding: 0 10px">                                }).render() );
</span><span class="cx" style="display: block; padding: 0 10px">                        } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                Filters = new All({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         Filters = new wp.media.view.AttachmentFilters.All({
</ins><span class="cx" style="display: block; padding: 0 10px">                                         controller: this.controller,
</span><span class="cx" style="display: block; padding: 0 10px">                                        model:      this.collection.props,
</span><span class="cx" style="display: block; padding: 0 10px">                                        priority:   -80
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3863,14 +3827,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        }).render() );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        // DateFilter is a <select>, screen reader text needs to be rendered before
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.toolbar.set( 'dateFilterLabel', new Label({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.toolbar.set( 'dateFilterLabel', new wp.media.view.Label({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 value: l10n.filterByDate,
</span><span class="cx" style="display: block; padding: 0 10px">                                attributes: {
</span><span class="cx" style="display: block; padding: 0 10px">                                        'for': 'media-attachment-date-filters'
</span><span class="cx" style="display: block; padding: 0 10px">                                },
</span><span class="cx" style="display: block; padding: 0 10px">                                priority: -75
</span><span class="cx" style="display: block; padding: 0 10px">                        }).render() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.toolbar.set( 'dateFilter', new DateFilter({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.toolbar.set( 'dateFilter', new wp.media.view.DateFilter({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 controller: this.controller,
</span><span class="cx" style="display: block; padding: 0 10px">                                model:      this.collection.props,
</span><span class="cx" style="display: block; padding: 0 10px">                                priority: -75
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3974,14 +3938,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                } else if ( this.options.date ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        // DateFilter is a <select>, screen reader text needs to be rendered before
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.toolbar.set( 'dateFilterLabel', new Label({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.toolbar.set( 'dateFilterLabel', new wp.media.view.Label({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 value: l10n.filterByDate,
</span><span class="cx" style="display: block; padding: 0 10px">                                attributes: {
</span><span class="cx" style="display: block; padding: 0 10px">                                        'for': 'media-attachment-date-filters'
</span><span class="cx" style="display: block; padding: 0 10px">                                },
</span><span class="cx" style="display: block; padding: 0 10px">                                priority: -75
</span><span class="cx" style="display: block; padding: 0 10px">                        }).render() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.toolbar.set( 'dateFilter', new DateFilter({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.toolbar.set( 'dateFilter', new wp.media.view.DateFilter({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 controller: this.controller,
</span><span class="cx" style="display: block; padding: 0 10px">                                model:      this.collection.props,
</span><span class="cx" style="display: block; padding: 0 10px">                                priority: -75
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3990,14 +3954,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( this.options.search ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        // Search is an input, screen reader text needs to be rendered before
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.toolbar.set( 'searchLabel', new Label({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.toolbar.set( 'searchLabel', new wp.media.view.Label({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 value: l10n.searchMediaLabel,
</span><span class="cx" style="display: block; padding: 0 10px">                                attributes: {
</span><span class="cx" style="display: block; padding: 0 10px">                                        'for': 'media-search-input'
</span><span class="cx" style="display: block; padding: 0 10px">                                },
</span><span class="cx" style="display: block; padding: 0 10px">                                priority:   60
</span><span class="cx" style="display: block; padding: 0 10px">                        }).render() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.toolbar.set( 'search', new Search({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.toolbar.set( 'search', new wp.media.view.Search({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 controller: this.controller,
</span><span class="cx" style="display: block; padding: 0 10px">                                model:      this.collection.props,
</span><span class="cx" style="display: block; padding: 0 10px">                                priority:   60
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4046,7 +4010,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        createUploader: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.uploader = new UploaderInline({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.uploader = new wp.media.view.UploaderInline({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this.controller,
</span><span class="cx" style="display: block; padding: 0 10px">                        status:     false,
</span><span class="cx" style="display: block; padding: 0 10px">                        message:    this.controller.isModeActive( 'grid' ) ? '' : l10n.noItemsFound,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4066,7 +4030,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        createAttachments: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.attachments = new Attachments({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.attachments = new wp.media.view.Attachments({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller:           this.controller,
</span><span class="cx" style="display: block; padding: 0 10px">                        collection:           this.collection,
</span><span class="cx" style="display: block; padding: 0 10px">                        selection:            this.options.selection,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4102,14 +4066,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">        createSidebar: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                var options = this.options,
</span><span class="cx" style="display: block; padding: 0 10px">                        selection = options.selection,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        sidebar = this.sidebar = new Sidebar({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 sidebar = this.sidebar = new wp.media.view.Sidebar({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 controller: this.controller
</span><span class="cx" style="display: block; padding: 0 10px">                        });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                this.views.add( sidebar );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( this.controller.uploader ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        sidebar.set( 'uploads', new UploaderStatus({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 sidebar.set( 'uploads', new wp.media.view.UploaderStatus({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 controller: this.controller,
</span><span class="cx" style="display: block; padding: 0 10px">                                priority:   40
</span><span class="cx" style="display: block; padding: 0 10px">                        }) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4127,20 +4091,20 @@
</span><span class="cx" style="display: block; padding: 0 10px">                var sidebar = this.sidebar,
</span><span class="cx" style="display: block; padding: 0 10px">                        single = this.options.selection.single();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                sidebar.set( 'details', new Details({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         sidebar.set( 'details', new wp.media.view.Attachment.Details({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this.controller,
</span><span class="cx" style="display: block; padding: 0 10px">                        model:      single,
</span><span class="cx" style="display: block; padding: 0 10px">                        priority:   80
</span><span class="cx" style="display: block; padding: 0 10px">                }) );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                sidebar.set( 'compat', new AttachmentCompat({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         sidebar.set( 'compat', new wp.media.view.AttachmentCompat({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this.controller,
</span><span class="cx" style="display: block; padding: 0 10px">                        model:      single,
</span><span class="cx" style="display: block; padding: 0 10px">                        priority:   120
</span><span class="cx" style="display: block; padding: 0 10px">                }) );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( this.options.display ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        sidebar.set( 'display', new AttachmentDisplay({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 sidebar.set( 'display', new wp.media.view.Settings.AttachmentDisplay({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 controller:   this.controller,
</span><span class="cx" style="display: block; padding: 0 10px">                                model:        this.model.display( single ),
</span><span class="cx" style="display: block; padding: 0 10px">                                attachment:   single,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4167,8 +4131,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = AttachmentsBrowser;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"../attachment-compat.js":18,"../attachment-filters/all.js":20,"../attachment-filters/date.js":21,"../attachment-filters/uploaded.js":22,"../attachment/details.js":24,"../attachment/library.js":27,"../attachments.js":29,"../label.js":47,"../search.js":55,"../settings/attachment-display.js":58,"../sidebar.js":61,"../spinner.js":62,"../toolbar.js":63,"../uploader/inline.js":67,"../uploader/status.js":69,"../view.js":71}],31:[function(require,module,exports){
-/*globals _ */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],31:[function(require,module,exports){
+/*globals wp, _ */
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * wp.media.view.Attachments.Selection
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4179,8 +4143,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Attachments = require( '../attachments.js' ),
-       AttachmentSelection = require( '../attachment/selection.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Attachments = wp.media.view.Attachments,
</ins><span class="cx" style="display: block; padding: 0 10px">         Selection;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> Selection = Attachments.extend({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4191,7 +4154,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        resize:     false,
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        // The single `Attachment` view to be used in the `Attachments` view.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        AttachmentView: AttachmentSelection
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 AttachmentView: wp.media.view.Attachment.Selection
</ins><span class="cx" style="display: block; padding: 0 10px">                 });
</span><span class="cx" style="display: block; padding: 0 10px">                // Call 'initialize' directly on the parent class.
</span><span class="cx" style="display: block; padding: 0 10px">                return Attachments.prototype.initialize.apply( this, arguments );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4200,7 +4163,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Selection;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"../attachment/selection.js":28,"../attachments.js":29}],32:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],32:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals _, Backbone */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4211,12 +4174,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       Button = require( './button.js' ),
-       $ = Backbone.$,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var $ = Backbone.$,
</ins><span class="cx" style="display: block; padding: 0 10px">         ButtonGroup;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-ButtonGroup = View.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ButtonGroup = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         tagName:   'div',
</span><span class="cx" style="display: block; padding: 0 10px">        className: 'button-group button-large media-button-group',
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4228,7 +4189,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( button instanceof Backbone.View ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                return button;
</span><span class="cx" style="display: block; padding: 0 10px">                        } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                return new Button( button ).render();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         return new wp.media.view.Button( button ).render();
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><span class="cx" style="display: block; padding: 0 10px">                });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4250,7 +4211,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = ButtonGroup;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./button.js":33,"./view.js":71}],33:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],33:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals _, Backbone */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4261,10 +4222,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       Button;
-
-Button = View.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Button = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         tagName:    'a',
</span><span class="cx" style="display: block; padding: 0 10px">        className:  'media-button',
</span><span class="cx" style="display: block; padding: 0 10px">        attributes: { href: '#' },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4341,7 +4299,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Button;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./view.js":71}],34:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],34:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp, _, jQuery */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4358,9 +4316,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       UploaderStatusError = require( './uploader/status-error.js' ),
-       UploaderStatus = require( './uploader/status.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var View = wp.media.View,
+       UploaderStatus = wp.media.view.UploaderStatus,
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        $ = jQuery,
</span><span class="cx" style="display: block; padding: 0 10px">        Cropper;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4402,7 +4359,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        onError: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                var filename = this.options.attachment.get('filename');
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.views.add( '.upload-errors', new UploaderStatusError({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.views.add( '.upload-errors', new wp.media.view.UploaderStatusError({
</ins><span class="cx" style="display: block; padding: 0 10px">                         filename: UploaderStatus.prototype.filename(filename),
</span><span class="cx" style="display: block; padding: 0 10px">                        message: window._wpMediaViewsL10n.cropError
</span><span class="cx" style="display: block; padding: 0 10px">                }), { at: 0 });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4411,7 +4368,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Cropper;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./uploader/status-error.js":68,"./uploader/status.js":69,"./view.js":71}],35:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],35:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp, _ */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4422,7 +4379,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var View = wp.media.View,
</ins><span class="cx" style="display: block; padding: 0 10px">         EditImage;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> EditImage = View.extend({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4469,7 +4426,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = EditImage;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./view.js":71}],36:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],36:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * wp.media.view.Embed
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4478,20 +4435,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       EmbedImage = require( './embed/image.js' ),
-       EmbedLink = require( './embed/link.js' ),
-       EmbedUrl = require( './embed/url.js' ),
-       Embed;
-
-Embed = View.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Embed = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         className: 'media-embed',
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        initialize: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                /**
</span><span class="cx" style="display: block; padding: 0 10px">                 * @member {wp.media.view.EmbedUrl}
</span><span class="cx" style="display: block; padding: 0 10px">                 */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.url = new EmbedUrl({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.url = new wp.media.view.EmbedUrl({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this.controller,
</span><span class="cx" style="display: block; padding: 0 10px">                        model:      this.model.props
</span><span class="cx" style="display: block; padding: 0 10px">                }).render();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4518,9 +4469,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        constructor;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( 'image' === type ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        constructor = EmbedImage;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 constructor = wp.media.view.EmbedImage;
</ins><span class="cx" style="display: block; padding: 0 10px">                 } else if ( 'link' === type ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        constructor = EmbedLink;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 constructor = wp.media.view.EmbedLink;
</ins><span class="cx" style="display: block; padding: 0 10px">                 } else {
</span><span class="cx" style="display: block; padding: 0 10px">                        return;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4539,7 +4490,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Embed;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./embed/image.js":37,"./embed/link.js":38,"./embed/url.js":39,"./view.js":71}],37:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],37:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4552,7 +4503,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var AttachmentDisplay = require( '../settings/attachment-display.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var AttachmentDisplay = wp.media.view.Settings.AttachmentDisplay,
</ins><span class="cx" style="display: block; padding: 0 10px">         EmbedImage;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> EmbedImage = AttachmentDisplay.extend({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4574,7 +4525,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = EmbedImage;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"../settings/attachment-display.js":58}],38:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],38:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp, _, jQuery */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4586,11 +4537,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Settings = require( '../settings.js' ),
-       $ = jQuery,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var $ = jQuery,
</ins><span class="cx" style="display: block; padding: 0 10px">         EmbedLink;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-EmbedLink = Settings.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+EmbedLink = wp.media.view.Settings.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         className: 'embed-link-settings',
</span><span class="cx" style="display: block; padding: 0 10px">        template:  wp.template('embed-link-settings'),
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4681,7 +4631,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = EmbedLink;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"../settings.js":57}],39:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],39:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp, _, jQuery */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4692,7 +4642,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( '../view.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var View = wp.media.View,
</ins><span class="cx" style="display: block; padding: 0 10px">         $ = jQuery,
</span><span class="cx" style="display: block; padding: 0 10px">        EmbedUrl;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4762,7 +4712,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = EmbedUrl;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"../view.js":71}],40:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],40:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * wp.media.view.FocusManager
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4771,11 +4721,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       FocusManager;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var FocusManager = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-FocusManager = View.extend({
-
</del><span class="cx" style="display: block; padding: 0 10px">         events: {
</span><span class="cx" style="display: block; padding: 0 10px">                'keydown': 'constrainTabbing'
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4811,7 +4758,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = FocusManager;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./view.js":71}],41:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],41:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals _, Backbone */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4829,13 +4776,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @mixes wp.media.controller.StateMachine
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var StateMachine = require( '../controllers/state-machine.js' ),
-       State = require( '../controllers/state.js' ),
-       Region = require( '../controllers/region.js' ),
-       View = require( './view.js' ),
-       Frame;
-
-Frame = View.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Frame = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         initialize: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                _.defaults( this.options, {
</span><span class="cx" style="display: block; padding: 0 10px">                        mode: [ 'select' ]
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4851,7 +4792,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Initialize regions.
</span><span class="cx" style="display: block; padding: 0 10px">                _.each( this.regions, function( region ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this[ region ] = new Region({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this[ region ] = new wp.media.controller.Region({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 view:     this,
</span><span class="cx" style="display: block; padding: 0 10px">                                id:       region,
</span><span class="cx" style="display: block; padding: 0 10px">                                selector: '.media-frame-' + region
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4869,7 +4810,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        _createStates: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                // Create the default `states` collection.
</span><span class="cx" style="display: block; padding: 0 10px">                this.states = new Backbone.Collection( null, {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        model: State
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 model: wp.media.controller.State
</ins><span class="cx" style="display: block; padding: 0 10px">                 });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Ensure states have a reference to the frame.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4981,11 +4922,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> // Make the `Frame` a `StateMachine`.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-_.extend( Frame.prototype, StateMachine.prototype );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+_.extend( Frame.prototype, wp.media.controller.StateMachine.prototype );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Frame;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"../controllers/region.js":12,"../controllers/state-machine.js":14,"../controllers/state.js":15,"./view.js":71}],42:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],42:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5003,13 +4944,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @mixes wp.media.controller.StateMachine
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Select = require( './select.js' ),
-       Toolbar = require( '../toolbar.js' ),
-       ImageDetailsController = require( '../../controllers/image-details.js' ),
-       ReplaceImageController = require( '../../controllers/replace-image.js' ),
-       EditImageController = require( '../../controllers/edit-image.js' ),
-       ImageDetailsView = require( '../image-details.js' ),
-       EditImageView = require( '../edit-image.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Select = wp.media.view.MediaFrame.Select,
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        ImageDetails;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5043,11 +4978,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        createStates: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                this.states.add([
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new ImageDetailsController({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.ImageDetails({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 image: this.image,
</span><span class="cx" style="display: block; padding: 0 10px">                                editable: false
</span><span class="cx" style="display: block; padding: 0 10px">                        }),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new ReplaceImageController({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.ReplaceImage({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 id: 'replace-image',
</span><span class="cx" style="display: block; padding: 0 10px">                                library: wp.media.query( { type: 'image' } ),
</span><span class="cx" style="display: block; padding: 0 10px">                                image: this.image,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5057,7 +4992,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                priority:  80,
</span><span class="cx" style="display: block; padding: 0 10px">                                displaySettings: true
</span><span class="cx" style="display: block; padding: 0 10px">                        }),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new EditImageController( {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.EditImage( {
</ins><span class="cx" style="display: block; padding: 0 10px">                                 image: this.image,
</span><span class="cx" style="display: block; padding: 0 10px">                                selection: this.options.selection
</span><span class="cx" style="display: block; padding: 0 10px">                        } )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5065,7 +5000,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        imageDetailsContent: function( options ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                options.view = new ImageDetailsView({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         options.view = new wp.media.view.ImageDetails({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        model: this.state().image,
</span><span class="cx" style="display: block; padding: 0 10px">                        attachment: this.state().image.attachment
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5081,7 +5016,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        return;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                view = new EditImageView( { model: model, controller: this } ).render();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         view = new wp.media.view.EditImage( { model: model, controller: this } ).render();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                this.content.set( view );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5091,7 +5026,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        renderImageDetailsToolbar: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.toolbar.set( new Toolbar({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.toolbar.set( new wp.media.view.Toolbar({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        items: {
</span><span class="cx" style="display: block; padding: 0 10px">                                select: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5123,7 +5058,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        lastState = frame.lastState(),
</span><span class="cx" style="display: block; padding: 0 10px">                        previous = lastState && lastState.id;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.toolbar.set( new Toolbar({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.toolbar.set( new wp.media.view.Toolbar({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        items: {
</span><span class="cx" style="display: block; padding: 0 10px">                                back: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5170,7 +5105,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = ImageDetails;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"../../controllers/edit-image.js":4,"../../controllers/image-details.js":9,"../../controllers/replace-image.js":13,"../edit-image.js":35,"../image-details.js":46,"../toolbar.js":63,"./select.js":44}],43:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],43:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp, _ */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5187,24 +5122,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @mixes wp.media.controller.StateMachine
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( '../view.js' ),
-       Select = require( './select.js' ),
-       Library = require( '../../controllers/library.js' ),
-       Embed = require( '../embed.js' ),
-       EditImage = require( '../edit-image.js' ),
-       EditSelection = require( '../attachment/edit-selection.js' ),
-       Toolbar = require( '../toolbar.js' ),
-       ToolbarEmbed = require( '../toolbar/embed.js' ),
-       PlaylistSettings = require( '../settings/playlist.js' ),
-       AttachmentsBrowser = require( '../attachments/browser.js' ),
-       SelectionView = require( '../selection.js' ),
-       EmbedController = require( '../../controllers/embed.js' ),
-       EditImageController = require( '../../controllers/edit-image.js' ),
-       GalleryEditController = require( '../../controllers/gallery-edit.js' ),
-       GalleryAddController = require( '../../controllers/gallery-add.js' ),
-       CollectionEditController = require( '../../controllers/collection-edit.js' ),
-       CollectionAddController = require( '../../controllers/collection-add.js' ),
-       FeaturedImageController = require( '../../controllers/featured-image.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Select = wp.media.view.MediaFrame.Select,
+       Library = wp.media.controller.Library,
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        Post;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5278,18 +5197,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        }),
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        // Embed states.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new EmbedController( { metadata: options.metadata } ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.Embed( { metadata: options.metadata } ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new EditImageController( { model: options.editImage } ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.EditImage( { model: options.editImage } ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        // Gallery states.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new GalleryEditController({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.GalleryEdit({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 library: options.selection,
</span><span class="cx" style="display: block; padding: 0 10px">                                editing: options.editing,
</span><span class="cx" style="display: block; padding: 0 10px">                                menu:    'gallery'
</span><span class="cx" style="display: block; padding: 0 10px">                        }),
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new GalleryAddController(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.GalleryAdd(),
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        new Library({
</span><span class="cx" style="display: block; padding: 0 10px">                                id:         'playlist',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5306,11 +5225,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        }),
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        // Playlist states.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new CollectionEditController({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.CollectionEdit({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 type: 'audio',
</span><span class="cx" style="display: block; padding: 0 10px">                                collectionType: 'playlist',
</span><span class="cx" style="display: block; padding: 0 10px">                                title:          l10n.editPlaylistTitle,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                SettingsView:   PlaylistSettings,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         SettingsView:   wp.media.view.Settings.Playlist,
</ins><span class="cx" style="display: block; padding: 0 10px">                                 library:        options.selection,
</span><span class="cx" style="display: block; padding: 0 10px">                                editing:        options.editing,
</span><span class="cx" style="display: block; padding: 0 10px">                                menu:           'playlist',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5318,7 +5237,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                dragInfo:       false
</span><span class="cx" style="display: block; padding: 0 10px">                        }),
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new CollectionAddController({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.CollectionAdd({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 type: 'audio',
</span><span class="cx" style="display: block; padding: 0 10px">                                collectionType: 'playlist',
</span><span class="cx" style="display: block; padding: 0 10px">                                title: l10n.addToPlaylistTitle
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5338,11 +5257,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                }, options.library ) )
</span><span class="cx" style="display: block; padding: 0 10px">                        }),
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new CollectionEditController({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.CollectionEdit({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 type: 'video',
</span><span class="cx" style="display: block; padding: 0 10px">                                collectionType: 'playlist',
</span><span class="cx" style="display: block; padding: 0 10px">                                title:          l10n.editVideoPlaylistTitle,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                SettingsView:   PlaylistSettings,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         SettingsView:   wp.media.view.Settings.Playlist,
</ins><span class="cx" style="display: block; padding: 0 10px">                                 library:        options.selection,
</span><span class="cx" style="display: block; padding: 0 10px">                                editing:        options.editing,
</span><span class="cx" style="display: block; padding: 0 10px">                                menu:           'video-playlist',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5350,7 +5269,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                dragInfo:       false
</span><span class="cx" style="display: block; padding: 0 10px">                        }),
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new CollectionAddController({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.CollectionAdd({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 type: 'video',
</span><span class="cx" style="display: block; padding: 0 10px">                                collectionType: 'playlist',
</span><span class="cx" style="display: block; padding: 0 10px">                                title: l10n.addToVideoPlaylistTitle
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5358,7 +5277,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                ]);
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( wp.media.view.settings.post.featuredImageId ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.states.add( new FeaturedImageController() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.states.add( new wp.media.controller.FeaturedImage() );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5445,7 +5364,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        mainMenu: function( view ) {
</span><span class="cx" style="display: block; padding: 0 10px">                view.set({
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'library-separator': new View({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'library-separator': new wp.media.View({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 className: 'separator',
</span><span class="cx" style="display: block; padding: 0 10px">                                priority: 100
</span><span class="cx" style="display: block; padding: 0 10px">                        })
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5484,7 +5403,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        this.controller.modal.focusManager.focus();
</span><span class="cx" style="display: block; padding: 0 10px">                                }
</span><span class="cx" style="display: block; padding: 0 10px">                        },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        separateCancel: new View({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 separateCancel: new wp.media.View({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 className: 'separator',
</span><span class="cx" style="display: block; padding: 0 10px">                                priority: 40
</span><span class="cx" style="display: block; padding: 0 10px">                        })
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5508,7 +5427,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        }
</span><span class="cx" style="display: block; padding: 0 10px">                                }
</span><span class="cx" style="display: block; padding: 0 10px">                        },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        separateCancel: new View({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 separateCancel: new wp.media.View({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 className: 'separator',
</span><span class="cx" style="display: block; padding: 0 10px">                                priority: 40
</span><span class="cx" style="display: block; padding: 0 10px">                        })
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5532,7 +5451,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        }
</span><span class="cx" style="display: block; padding: 0 10px">                                }
</span><span class="cx" style="display: block; padding: 0 10px">                        },
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        separateCancel: new View({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 separateCancel: new wp.media.View({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 className: 'separator',
</span><span class="cx" style="display: block; padding: 0 10px">                                priority: 40
</span><span class="cx" style="display: block; padding: 0 10px">                        })
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5541,7 +5460,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        // Content
</span><span class="cx" style="display: block; padding: 0 10px">        embedContent: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                var view = new Embed({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         var view = new wp.media.view.Embed({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        model:      this.state()
</span><span class="cx" style="display: block; padding: 0 10px">                }).render();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5558,7 +5477,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        selection = state.get('selection'),
</span><span class="cx" style="display: block; padding: 0 10px">                        view;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                view = new AttachmentsBrowser({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         view = new wp.media.view.AttachmentsBrowser({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        collection: selection,
</span><span class="cx" style="display: block; padding: 0 10px">                        selection:  selection,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5568,7 +5487,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        date:       false,
</span><span class="cx" style="display: block; padding: 0 10px">                        dragInfo:   true,
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        AttachmentView: EditSelection
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 AttachmentView: wp.media.view.Attachments.EditSelection
</ins><span class="cx" style="display: block; padding: 0 10px">                 }).render();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                view.toolbar.set( 'backToLibrary', {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5589,7 +5508,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        editImageContent: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                var image = this.state().get('image'),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        view = new EditImage( { model: image, controller: this } ).render();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 view = new wp.media.view.EditImage( { model: image, controller: this } ).render();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                this.content.set( view );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5606,7 +5525,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        selectionStatusToolbar: function( view ) {
</span><span class="cx" style="display: block; padding: 0 10px">                var editable = this.state().get('editable');
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                view.set( 'selection', new SelectionView({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         view.set( 'selection', new wp.media.view.Selection({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        collection: this.state().get('selection'),
</span><span class="cx" style="display: block; padding: 0 10px">                        priority:   -40,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5747,14 +5666,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        mainEmbedToolbar: function( toolbar ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                toolbar.view = new ToolbarEmbed({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         toolbar.view = new wp.media.view.Toolbar.Embed({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this
</span><span class="cx" style="display: block; padding: 0 10px">                });
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        galleryEditToolbar: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                var editing = this.state().get('editing');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.toolbar.set( new Toolbar({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.toolbar.set( new wp.media.view.Toolbar({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        items: {
</span><span class="cx" style="display: block; padding: 0 10px">                                insert: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5783,7 +5702,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        galleryAddToolbar: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.toolbar.set( new Toolbar({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.toolbar.set( new wp.media.view.Toolbar({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        items: {
</span><span class="cx" style="display: block; padding: 0 10px">                                insert: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5811,7 +5730,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        playlistEditToolbar: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                var editing = this.state().get('editing');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.toolbar.set( new Toolbar({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.toolbar.set( new wp.media.view.Toolbar({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        items: {
</span><span class="cx" style="display: block; padding: 0 10px">                                insert: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5840,7 +5759,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        playlistAddToolbar: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.toolbar.set( new Toolbar({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.toolbar.set( new wp.media.view.Toolbar({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        items: {
</span><span class="cx" style="display: block; padding: 0 10px">                                insert: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5868,7 +5787,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        videoPlaylistEditToolbar: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                var editing = this.state().get('editing');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.toolbar.set( new Toolbar({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.toolbar.set( new wp.media.view.Toolbar({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        items: {
</span><span class="cx" style="display: block; padding: 0 10px">                                insert: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5897,7 +5816,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        videoPlaylistAddToolbar: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.toolbar.set( new Toolbar({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.toolbar.set( new wp.media.view.Toolbar({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        items: {
</span><span class="cx" style="display: block; padding: 0 10px">                                insert: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5923,7 +5842,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Post;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"../../controllers/collection-add.js":1,"../../controllers/collection-edit.js":2,"../../controllers/edit-image.js":4,"../../controllers/embed.js":5,"../../controllers/featured-image.js":6,"../../controllers/gallery-add.js":7,"../../controllers/gallery-edit.js":8,"../../controllers/library.js":10,"../attachment/edit-selection.js":26,"../attachments/browser.js":30,"../edit-image.js":35,"../embed.js":36,"../selection.js":56,"../settings/playlist.js":60,"../toolbar.js":63,"../toolbar/embed.js":64,"../view.js":71,"./select.js":44}],44:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],44:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp, _ */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5940,11 +5859,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @mixes wp.media.controller.StateMachine
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var MediaFrame = require( '../media-frame.js' ),
-       Library = require( '../../controllers/library.js' ),
-       AttachmentsBrowser = require( '../attachments/browser.js' ),
-       UploaderInline = require( '../uploader/inline.js' ),
-       ToolbarSelect = require( '../toolbar/select.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var MediaFrame = wp.media.view.MediaFrame,
</ins><span class="cx" style="display: block; padding: 0 10px">         l10n = wp.media.view.l10n,
</span><span class="cx" style="display: block; padding: 0 10px">        Select;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6002,7 +5917,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                // Add the default states.
</span><span class="cx" style="display: block; padding: 0 10px">                this.states.add([
</span><span class="cx" style="display: block; padding: 0 10px">                        // Main states.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        new Library({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 new wp.media.controller.Library({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 library:   wp.media.query( options.library ),
</span><span class="cx" style="display: block; padding: 0 10px">                                multiple:  options.multiple,
</span><span class="cx" style="display: block; padding: 0 10px">                                title:     options.title,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6053,7 +5968,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                this.$el.removeClass('hide-toolbar');
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Browse our library of attachments.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                contentRegion.view = new AttachmentsBrowser({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         contentRegion.view = new wp.media.view.AttachmentsBrowser({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        collection: state.get('library'),
</span><span class="cx" style="display: block; padding: 0 10px">                        selection:  state.get('selection'),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6077,7 +5992,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        uploadContent: function() {
</span><span class="cx" style="display: block; padding: 0 10px">                this.$el.removeClass( 'hide-toolbar' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.content.set( new UploaderInline({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.content.set( new wp.media.view.UploaderInline({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this
</span><span class="cx" style="display: block; padding: 0 10px">                }) );
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6093,13 +6008,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">                options = options || this.options.button || {};
</span><span class="cx" style="display: block; padding: 0 10px">                options.controller = this;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                toolbar.view = new ToolbarSelect( options );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         toolbar.view = new wp.media.view.Toolbar.Select( options );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Select;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"../../controllers/library.js":10,"../attachments/browser.js":30,"../media-frame.js":48,"../toolbar/select.js":65,"../uploader/inline.js":67}],45:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],45:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * wp.media.view.Iframe
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6108,10 +6023,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       Iframe;
-
-Iframe = View.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Iframe = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         className: 'media-iframe',
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><span class="cx" style="display: block; padding: 0 10px">         * @returns {wp.media.view.Iframe} Returns itself to allow chaining
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6126,7 +6038,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Iframe;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./view.js":71}],46:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],46:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp, _, jQuery */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6139,7 +6051,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var AttachmentDisplay = require( './settings/attachment-display.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var AttachmentDisplay = wp.media.view.Settings.AttachmentDisplay,
</ins><span class="cx" style="display: block; padding: 0 10px">         $ = jQuery,
</span><span class="cx" style="display: block; padding: 0 10px">        ImageDetails;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6296,7 +6208,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = ImageDetails;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./settings/attachment-display.js":58}],47:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],47:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * wp.media.view.Label
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6305,10 +6217,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       Label;
-
-Label = View.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Label = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         tagName: 'label',
</span><span class="cx" style="display: block; padding: 0 10px">        className: 'screen-reader-text',
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6325,7 +6234,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Label;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./view.js":71}],48:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],48:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp, _, jQuery */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6340,14 +6249,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @mixes wp.media.controller.StateMachine
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       Frame = require( './frame.js' ),
-       Modal = require( './modal.js' ),
-       UploaderWindow = require( './uploader/window.js' ),
-       Menu = require( './menu.js' ),
-       Toolbar = require( './toolbar.js' ),
-       Router = require( './router.js' ),
-       Iframe = require( './iframe.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Frame = wp.media.view.Frame,
</ins><span class="cx" style="display: block; padding: 0 10px">         $ = jQuery,
</span><span class="cx" style="display: block; padding: 0 10px">        MediaFrame;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6377,7 +6279,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Initialize modal container view.
</span><span class="cx" style="display: block; padding: 0 10px">                if ( this.options.modal ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.modal = new Modal({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.modal = new wp.media.view.Modal({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                                title:      this.options.title
</span><span class="cx" style="display: block; padding: 0 10px">                        });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6393,7 +6295,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Initialize window-wide uploader.
</span><span class="cx" style="display: block; padding: 0 10px">                if ( this.options.uploader ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        this.uploader = new UploaderWindow({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 this.uploader = new wp.media.view.UploaderWindow({
</ins><span class="cx" style="display: block; padding: 0 10px">                                 controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                                uploader: {
</span><span class="cx" style="display: block; padding: 0 10px">                                        dropzone:  this.modal ? this.modal.$el : this.$el,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6434,7 +6336,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @this wp.media.controller.Region
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        createTitle: function( title ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                title.view = new View({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         title.view = new wp.media.View({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this,
</span><span class="cx" style="display: block; padding: 0 10px">                        tagName: 'h1'
</span><span class="cx" style="display: block; padding: 0 10px">                });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6444,7 +6346,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @this wp.media.controller.Region
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        createMenu: function( menu ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                menu.view = new Menu({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         menu.view = new wp.media.view.Menu({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this
</span><span class="cx" style="display: block; padding: 0 10px">                });
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6458,7 +6360,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @this wp.media.controller.Region
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        createToolbar: function( toolbar ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                toolbar.view = new Toolbar({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         toolbar.view = new wp.media.view.Toolbar({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this
</span><span class="cx" style="display: block; padding: 0 10px">                });
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6467,7 +6369,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @this wp.media.controller.Region
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        createRouter: function( router ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                router.view = new Router({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         router.view = new wp.media.view.Router({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this
</span><span class="cx" style="display: block; padding: 0 10px">                });
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6514,7 +6416,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        iframeContent: function( content ) {
</span><span class="cx" style="display: block; padding: 0 10px">                this.$el.addClass('hide-toolbar');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                content.view = new Iframe({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         content.view = new wp.media.view.Iframe({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this
</span><span class="cx" style="display: block; padding: 0 10px">                });
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6581,7 +6483,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = MediaFrame;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./frame.js":41,"./iframe.js":45,"./menu.js":50,"./modal.js":51,"./router.js":54,"./toolbar.js":63,"./uploader/window.js":70,"./view.js":71}],49:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],49:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals jQuery */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6592,11 +6494,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       $ = jQuery,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var $ = jQuery,
</ins><span class="cx" style="display: block; padding: 0 10px">         MenuItem;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-MenuItem = View.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+MenuItem = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         tagName:   'a',
</span><span class="cx" style="display: block; padding: 0 10px">        className: 'media-menu-item',
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6656,7 +6557,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = MenuItem;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./view.js":71}],50:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],50:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * wp.media.view.Menu
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6666,8 +6567,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var MenuItem = require( './menu-item.js' ),
-       PriorityList = require( './priority-list.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var MenuItem = wp.media.view.MenuItem,
+       PriorityList = wp.media.view.PriorityList,
</ins><span class="cx" style="display: block; padding: 0 10px">         Menu;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> Menu = PriorityList.extend({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6773,7 +6674,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Menu;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./menu-item.js":49,"./priority-list.js":52}],51:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],51:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp, _, jQuery */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6786,12 +6687,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       FocusManager = require( './focus-manager.js' ),
-       $ = jQuery,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var $ = jQuery,
</ins><span class="cx" style="display: block; padding: 0 10px">         Modal;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Modal = View.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Modal = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         tagName:  'div',
</span><span class="cx" style="display: block; padding: 0 10px">        template: wp.template('media-modal'),
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6812,7 +6711,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        freeze:    true
</span><span class="cx" style="display: block; padding: 0 10px">                });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.focusManager = new FocusManager({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.focusManager = new wp.media.view.FocusManager({
</ins><span class="cx" style="display: block; padding: 0 10px">                         el: this.el
</span><span class="cx" style="display: block; padding: 0 10px">                });
</span><span class="cx" style="display: block; padding: 0 10px">        },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6990,7 +6889,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Modal;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./focus-manager.js":40,"./view.js":71}],52:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],52:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals _, Backbone */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7001,10 +6900,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       PriorityList;
-
-PriorityList = View.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var PriorityList = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         tagName:   'div',
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        initialize: function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7086,13 +6982,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @returns {wp.media.View}
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        toView: function( options ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return new View( options );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return new wp.media.View( options );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = PriorityList;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./view.js":71}],53:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],53:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * wp.media.view.RouterItem
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7102,10 +6998,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var MenuItem = require( './menu-item.js' ),
-       RouterItem;
-
-RouterItem = MenuItem.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var RouterItem = wp.media.view.MenuItem.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         /**
</span><span class="cx" style="display: block; padding: 0 10px">         * On click handler to activate the content region's corresponding mode.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7119,7 +7012,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = RouterItem;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./menu-item.js":49}],54:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],54:[function(require,module,exports){
+/*globals wp */
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * wp.media.view.Router
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7130,15 +7025,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Menu = require( './menu.js' ),
-       RouterItem = require( './router-item.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Menu = wp.media.view.Menu,
</ins><span class="cx" style="display: block; padding: 0 10px">         Router;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> Router = Menu.extend({
</span><span class="cx" style="display: block; padding: 0 10px">        tagName:   'div',
</span><span class="cx" style="display: block; padding: 0 10px">        className: 'media-router',
</span><span class="cx" style="display: block; padding: 0 10px">        property:  'contentMode',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        ItemView:  RouterItem,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ItemView:  wp.media.view.RouterItem,
</ins><span class="cx" style="display: block; padding: 0 10px">         region:    'router',
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        initialize: function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7157,7 +7051,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Router;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./menu.js":50,"./router-item.js":53}],55:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],55:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7168,11 +7062,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       l10n = wp.media.view.l10n,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var l10n = wp.media.view.l10n,
</ins><span class="cx" style="display: block; padding: 0 10px">         Search;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Search = View.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Search = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         tagName:   'input',
</span><span class="cx" style="display: block; padding: 0 10px">        className: 'search',
</span><span class="cx" style="display: block; padding: 0 10px">        id:        'media-search-input',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7208,7 +7101,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Search;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./view.js":71}],56:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],56:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp, _, Backbone */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7219,12 +7112,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       AttachmentsSelection = require( './attachments/selection.js' ),
-       l10n = wp.media.view.l10n,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var l10n = wp.media.view.l10n,
</ins><span class="cx" style="display: block; padding: 0 10px">         Selection;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Selection = View.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Selection = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         tagName:   'div',
</span><span class="cx" style="display: block; padding: 0 10px">        className: 'media-selection',
</span><span class="cx" style="display: block; padding: 0 10px">        template:  wp.template('media-selection'),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7243,7 +7134,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                /**
</span><span class="cx" style="display: block; padding: 0 10px">                 * @member {wp.media.view.Attachments.Selection}
</span><span class="cx" style="display: block; padding: 0 10px">                 */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.attachments = new AttachmentsSelection({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.attachments = new wp.media.view.Attachments.Selection({
</ins><span class="cx" style="display: block; padding: 0 10px">                         controller: this.controller,
</span><span class="cx" style="display: block; padding: 0 10px">                        collection: this.collection,
</span><span class="cx" style="display: block; padding: 0 10px">                        selection:  this.collection,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7295,7 +7186,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Selection;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./attachments/selection.js":31,"./view.js":71}],57:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],57:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals _, Backbone */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7306,7 +7197,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var View = wp.media.View,
</ins><span class="cx" style="display: block; padding: 0 10px">         $ = Backbone.$,
</span><span class="cx" style="display: block; padding: 0 10px">        Settings;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7418,7 +7309,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Settings;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./view.js":71}],58:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],58:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp, _ */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7430,7 +7321,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Settings = require( '../settings.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Settings = wp.media.view.Settings,
</ins><span class="cx" style="display: block; padding: 0 10px">         AttachmentDisplay;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> AttachmentDisplay = Settings.extend({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7514,7 +7405,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = AttachmentDisplay;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"../settings.js":57}],59:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],59:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7526,17 +7417,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Settings = require( '../settings.js' ),
-       Gallery;
-
-Gallery = Settings.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Gallery = wp.media.view.Settings.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         className: 'collection-settings gallery-settings',
</span><span class="cx" style="display: block; padding: 0 10px">        template:  wp.template('gallery-settings')
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Gallery;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"../settings.js":57}],60:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],60:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals wp */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7548,17 +7436,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var Settings = require( '../settings.js' ),
-       Playlist;
-
-Playlist = Settings.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Playlist = wp.media.view.Settings.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         className: 'collection-settings playlist-settings',
</span><span class="cx" style="display: block; padding: 0 10px">        template:  wp.template('playlist-settings')
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Playlist;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"../settings.js":57}],61:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],61:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px">  * wp.media.view.Sidebar
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7568,16 +7453,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var PriorityList = require( './priority-list.js' ),
-       Sidebar;
-
-Sidebar = PriorityList.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Sidebar = wp.media.view.PriorityList.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         className: 'media-sidebar'
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Sidebar;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./priority-list.js":52}],62:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],62:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals _ */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7588,10 +7470,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       Spinner;
-
-Spinner = View.extend({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var Spinner = wp.media.View.extend({
</ins><span class="cx" style="display: block; padding: 0 10px">         tagName:   'span',
</span><span class="cx" style="display: block; padding: 0 10px">        className: 'spinner',
</span><span class="cx" style="display: block; padding: 0 10px">        spinnerTimeout: false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7617,7 +7496,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Spinner;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-},{"./view.js":71}],63:[function(require,module,exports){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+},{}],63:[function(require,module,exports){
</ins><span class="cx" style="display: block; padding: 0 10px"> /*globals _, Backbone */
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7631,9 +7510,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments wp.Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  * @augments Backbone.View
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-var View = require( './view.js' ),
-       Button = require( './button.js' ),
-       PriorityList = require( './priority-list.js' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var View = wp.media.View,
</ins><span class="cx" style="display: block; padding: 0 10px">         Toolbar;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> Toolbar = View.extend({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7648,8 +7525,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                this._views = {};
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // The toolbar is composed of two `PriorityList` views.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                this.primary   = new PriorityList();
-               this.secondary = new PriorityList();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         this.primary   = new wp.media.view.PriorityList();
+               this.secondary = new wp.media.view.PriorityList();
</ins><span class="cx" style="display: block; padding: 0 10px">                 this.primary.$el.addClass('media-toolbar-primary search-form');
</span><span class="cx" style="display: block; padding: 0 10px">                this.secondary.$el.addClass('media-toolbar-secondary');
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7711,7 +7588,7 @@
</span><span class="cx" style="display: blo