<!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>[31385] trunk: Media JS files:</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/31385">31385</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/31385","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-02-09 16:00:44 +0000 (Mon, 09 Feb 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'>Media JS files:
* In media manifests, ditch IIFEs and global injection, these get dynamically scoped via Browserify
* Remove the `debug` option from `browserify:media`
* Add `jshint:media` to `jshint:corejs`
* Add a trailing newline to all new module files
Props iseulde.
See <a href="https://core.trac.wordpress.org/ticket/28510">#28510</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkGruntfilejs">trunk/Gruntfile.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaaudiovideojs">trunk/src/wp-includes/js/media/audio-video.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaaudiovideomanifestjs">trunk/src/wp-includes/js/media/audio-video.manifest.js</a></li>
<li><a href="#trunksrcwpincludesjsmediacontrollersaudiodetailsjs">trunk/src/wp-includes/js/media/controllers/audio-details.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="#trunksrcwpincludesjsmediacontrollersregionjs">trunk/src/wp-includes/js/media/controllers/region.js</a></li>
<li><a href="#trunksrcwpincludesjsmediacontrollersreplaceimagejs">trunk/src/wp-includes/js/media/controllers/replace-image.js</a></li>
<li><a href="#trunksrcwpincludesjsmediacontrollersstatemachinejs">trunk/src/wp-includes/js/media/controllers/state-machine.js</a></li>
<li><a href="#trunksrcwpincludesjsmediacontrollersstatejs">trunk/src/wp-includes/js/media/controllers/state.js</a></li>
<li><a href="#trunksrcwpincludesjsmediacontrollersvideodetailsjs">trunk/src/wp-includes/js/media/controllers/video-details.js</a></li>
<li><a href="#trunksrcwpincludesjsmediagridjs">trunk/src/wp-includes/js/media/grid.js</a></li>
<li><a href="#trunksrcwpincludesjsmediagridmanifestjs">trunk/src/wp-includes/js/media/grid.manifest.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="#trunksrcwpincludesjsmediamodelspostmediajs">trunk/src/wp-includes/js/media/models/post-media.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="#trunksrcwpincludesjsmediaroutersmanagejs">trunk/src/wp-includes/js/media/routers/manage.js</a></li>
<li><a href="#trunksrcwpincludesjsmediautilsselectionsyncjs">trunk/src/wp-includes/js/media/utils/selection-sync.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsattachmentdetailstwocolumnjs">trunk/src/wp-includes/js/media/views/attachment/details-two-column.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="#trunksrcwpincludesjsmediaviewsbuttondeleteselectedjs">trunk/src/wp-includes/js/media/views/button/delete-selected.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsbuttonselectmodetogglejs">trunk/src/wp-includes/js/media/views/button/select-mode-toggle.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="#trunksrcwpincludesjsmediaviewseditimagedetailsjs">trunk/src/wp-includes/js/media/views/edit-image-details.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="#trunksrcwpincludesjsmediaviewsmediadetailsjs">trunk/src/wp-includes/js/media/views/media-details.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="#trunksrcwpincludesjsmediaviewsviewjs">trunk/src/wp-includes/js/media/views/view.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media/views.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsmanifestjs">trunk/src/wp-includes/js/media/views.manifest.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkGruntfilejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/Gruntfile.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/Gruntfile.js 2015-02-09 12:35:38 UTC (rev 31384)
+++ trunk/Gruntfile.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,8 +123,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'src/wp-includes/js/media/views.js' : [ SOURCE_DIR + 'wp-includes/js/media/views.manifest.js' ],
</span><span class="cx" style="display: block; padding: 0 10px"> 'src/wp-includes/js/media/audio-video.js' : [ SOURCE_DIR + 'wp-includes/js/media/audio-video.manifest.js' ],
</span><span class="cx" style="display: block; padding: 0 10px"> 'src/wp-includes/js/media/grid.js' : [ SOURCE_DIR + 'wp-includes/js/media/grid.manifest.js' ]
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- },
- options: { debug: true }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> sass: {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -235,6 +234,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '!twenty{fourteen,fifteen}/js/html5.js'
</span><span class="cx" style="display: block; padding: 0 10px"> ]
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ media: {
+ options: {
+ browserify: true
+ },
+ expand: true,
+ cwd: SOURCE_DIR,
+ src: [
+ 'wp-includes/js/media/**/*.js',
+ '!wp-includes/js/media/*.js',
+ 'wp-includes/js/media/*.manifest.js'
+ ]
+ },
</ins><span class="cx" style="display: block; padding: 0 10px"> core: {
</span><span class="cx" style="display: block; padding: 0 10px"> expand: true,
</span><span class="cx" style="display: block; padding: 0 10px"> cwd: SOURCE_DIR,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -507,7 +518,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.registerTask('colors', ['sass:colors', 'autoprefixer:colors']);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // JSHint task.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- grunt.registerTask('jshint:corejs', ['jshint:grunt', 'jshint:tests', 'jshint:themes', 'jshint:core']);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ grunt.registerTask( 'jshint:corejs', [
+ 'jshint:grunt',
+ 'jshint:tests',
+ 'jshint:themes',
+ 'jshint:core',
+ 'jshint:media'
+ ] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Pre-commit task.
</span><span class="cx" style="display: block; padding: 0 10px"> grunt.registerTask('precommit', 'Runs front-end dev/test tasks in preparation for a commit.',
</span></span></pre></div>
<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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/audio-video.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,231 +1,221 @@
</span><span class="cx" style="display: block; padding: 0 10px"> (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/* global wp, _wpMediaViewsL10n, _wpmejsSettings, MediaElementPlayer */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var media = wp.media,
+ baseSettings = window._wpmejsSettings || {},
+ l10n = window._wpMediaViewsL10n || {};
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-(function(_) {
- var media = wp.media,
- baseSettings = {},
- l10n = typeof _wpMediaViewsL10n === 'undefined' ? {} : _wpMediaViewsL10n;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * @mixin
+ */
+wp.media.mixin = {
+ mejsSettings: baseSettings,
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! _.isUndefined( window._wpmejsSettings ) ) {
- baseSettings = _wpmejsSettings;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ removeAllPlayers: function() {
+ var p;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( window.mejs && window.mejs.players ) {
+ for ( p in window.mejs.players ) {
+ window.mejs.players[p].pause();
+ this.removePlayer( window.mejs.players[p] );
+ }
+ }
+ },
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @mixin
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Override the MediaElement method for removing a player.
+ * MediaElement tries to pull the audio/video tag out of
+ * its container and re-add it to the DOM.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp.media.mixin = {
- mejsSettings: baseSettings,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ removePlayer: function(t) {
+ var featureIndex, feature;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- removeAllPlayers: function() {
- var p;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! t.options ) {
+ return;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( window.mejs && window.mejs.players ) {
- for ( p in window.mejs.players ) {
- window.mejs.players[p].pause();
- this.removePlayer( window.mejs.players[p] );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // invoke features cleanup
+ for ( featureIndex in t.options.features ) {
+ feature = t.options.features[featureIndex];
+ if ( t['clean' + feature] ) {
+ try {
+ t['clean' + feature](t);
+ } catch (e) {}
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Override the MediaElement method for removing a player.
- * MediaElement tries to pull the audio/video tag out of
- * its container and re-add it to the DOM.
- */
- removePlayer: function(t) {
- var featureIndex, feature;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! t.isDynamic ) {
+ t.$node.remove();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! t.options ) {
- return;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'native' !== t.media.pluginType ) {
+ t.media.remove();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // invoke features cleanup
- for ( featureIndex in t.options.features ) {
- feature = t.options.features[featureIndex];
- if ( t['clean' + feature] ) {
- try {
- t['clean' + feature](t);
- } catch (e) {}
- }
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ delete window.mejs.players[t.id];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! t.isDynamic ) {
- t.$node.remove();
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ t.container.remove();
+ t.globalUnbind();
+ delete t.node.player;
+ },
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'native' !== t.media.pluginType ) {
- t.media.remove();
- }
-
- delete window.mejs.players[t.id];
-
- t.container.remove();
- t.globalUnbind();
- delete t.node.player;
- },
-
- /**
- * Allows any class that has set 'player' to a MediaElementPlayer
- * instance to remove the player when listening to events.
- *
- * Examples: modal closes, shortcode properties are removed, etc.
- */
- unsetPlayers : function() {
- if ( this.players && this.players.length ) {
- _.each( this.players, function (player) {
- player.pause();
- wp.media.mixin.removePlayer( player );
- } );
- this.players = [];
- }
- }
- };
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Autowire "collection"-type shortcodes
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Allows any class that has set 'player' to a MediaElementPlayer
+ * instance to remove the player when listening to events.
+ *
+ * Examples: modal closes, shortcode properties are removed, etc.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp.media.playlist = new wp.media.collection({
- tag: 'playlist',
- editTitle : l10n.editPlaylistTitle,
- defaults : {
- id: wp.media.view.settings.post.id,
- style: 'light',
- tracklist: true,
- tracknumbers: true,
- images: true,
- artists: true,
- type: 'audio'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unsetPlayers : function() {
+ if ( this.players && this.players.length ) {
+ _.each( this.players, function (player) {
+ player.pause();
+ wp.media.mixin.removePlayer( player );
+ } );
+ this.players = [];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+};
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Shortcode modeling for audio
- * `edit()` prepares the shortcode for the media modal
- * `shortcode()` builds the new shortcode after update
- *
- * @namespace
- */
- wp.media.audio = {
- coerce : wp.media.coerce,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Autowire "collection"-type shortcodes
+ */
+wp.media.playlist = new wp.media.collection({
+ tag: 'playlist',
+ editTitle : l10n.editPlaylistTitle,
+ defaults : {
+ id: wp.media.view.settings.post.id,
+ style: 'light',
+ tracklist: true,
+ tracknumbers: true,
+ images: true,
+ artists: true,
+ type: 'audio'
+ }
+});
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- defaults : {
- id : wp.media.view.settings.post.id,
- src : '',
- loop : false,
- autoplay : false,
- preload : 'none',
- width : 400
- },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Shortcode modeling for audio
+ * `edit()` prepares the shortcode for the media modal
+ * `shortcode()` builds the new shortcode after update
+ *
+ * @namespace
+ */
+wp.media.audio = {
+ coerce : wp.media.coerce,
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- edit : function( data ) {
- var frame, shortcode = wp.shortcode.next( 'audio', data ).shortcode;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ defaults : {
+ id : wp.media.view.settings.post.id,
+ src : '',
+ loop : false,
+ autoplay : false,
+ preload : 'none',
+ width : 400
+ },
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- frame = wp.media({
- frame: 'audio',
- state: 'audio-details',
- metadata: _.defaults( shortcode.attrs.named, this.defaults )
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ edit : function( data ) {
+ var frame, shortcode = wp.shortcode.next( 'audio', data ).shortcode;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return frame;
- },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ frame = wp.media({
+ frame: 'audio',
+ state: 'audio-details',
+ metadata: _.defaults( shortcode.attrs.named, this.defaults )
+ });
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- shortcode : function( model ) {
- var content;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return frame;
+ },
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _.each( this.defaults, function( value, key ) {
- model[ key ] = self.coerce( model, key );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ shortcode : function( model ) {
+ var content;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( value === model[ key ] ) {
- delete model[ key ];
- }
- }, this );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _.each( this.defaults, function( value, key ) {
+ model[ key ] = this.coerce( model, key );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- content = model.content;
- delete model.content;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( value === model[ key ] ) {
+ delete model[ key ];
+ }
+ }, this );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new wp.shortcode({
- tag: 'audio',
- attrs: model,
- content: content
- });
- }
- };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ content = model.content;
+ delete model.content;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Shortcode modeling for video
- * `edit()` prepares the shortcode for the media modal
- * `shortcode()` builds the new shortcode after update
- *
- * @namespace
- */
- wp.media.video = {
- coerce : wp.media.coerce,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new wp.shortcode({
+ tag: 'audio',
+ attrs: model,
+ content: content
+ });
+ }
+};
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- defaults : {
- id : wp.media.view.settings.post.id,
- src : '',
- poster : '',
- loop : false,
- autoplay : false,
- preload : 'metadata',
- content : '',
- width : 640,
- height : 360
- },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Shortcode modeling for video
+ * `edit()` prepares the shortcode for the media modal
+ * `shortcode()` builds the new shortcode after update
+ *
+ * @namespace
+ */
+wp.media.video = {
+ coerce : wp.media.coerce,
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- edit : function( data ) {
- var frame,
- shortcode = wp.shortcode.next( 'video', data ).shortcode,
- attrs;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ defaults : {
+ id : wp.media.view.settings.post.id,
+ src : '',
+ poster : '',
+ loop : false,
+ autoplay : false,
+ preload : 'metadata',
+ content : '',
+ width : 640,
+ height : 360
+ },
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- attrs = shortcode.attrs.named;
- attrs.content = shortcode.content;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ edit : function( data ) {
+ var frame,
+ shortcode = wp.shortcode.next( 'video', data ).shortcode,
+ attrs;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- frame = wp.media({
- frame: 'video',
- state: 'video-details',
- metadata: _.defaults( attrs, this.defaults )
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ attrs = shortcode.attrs.named;
+ attrs.content = shortcode.content;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return frame;
- },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ frame = wp.media({
+ frame: 'video',
+ state: 'video-details',
+ metadata: _.defaults( attrs, this.defaults )
+ });
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- shortcode : function( model ) {
- var content;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return frame;
+ },
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _.each( this.defaults, function( value, key ) {
- model[ key ] = this.coerce( model, key );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ shortcode : function( model ) {
+ var content;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( value === model[ key ] ) {
- delete model[ key ];
- }
- }, this );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _.each( this.defaults, function( value, key ) {
+ model[ key ] = this.coerce( model, key );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- content = model.content;
- delete model.content;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( value === model[ key ] ) {
+ delete model[ key ];
+ }
+ }, this );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new wp.shortcode({
- tag: 'video',
- attrs: model,
- content: content
- });
- }
- };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ content = model.content;
+ delete model.content;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- media.model.PostMedia = require( './models/post-media.js' );
- media.controller.AudioDetails = require( './controllers/audio-details.js' );
- media.controller.VideoDetails = require( './controllers/video-details.js' );
- media.view.MediaFrame.MediaDetails = require( './views/frame/media-details.js' );
- media.view.MediaFrame.AudioDetails = require( './views/frame/audio-details.js' );
- media.view.MediaFrame.VideoDetails = require( './views/frame/video-details.js' );
- media.view.MediaDetails = require( './views/media-details.js' );
- media.view.AudioDetails = require( './views/audio-details.js' );
- media.view.VideoDetails = require( './views/video-details.js' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new wp.shortcode({
+ tag: 'video',
+ attrs: model,
+ content: content
+ });
+ }
+};
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}(_));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+media.model.PostMedia = require( './models/post-media.js' );
+media.controller.AudioDetails = require( './controllers/audio-details.js' );
+media.controller.VideoDetails = require( './controllers/video-details.js' );
+media.view.MediaFrame.MediaDetails = require( './views/frame/media-details.js' );
+media.view.MediaFrame.AudioDetails = require( './views/frame/audio-details.js' );
+media.view.MediaFrame.VideoDetails = require( './views/frame/video-details.js' );
+media.view.MediaDetails = require( './views/media-details.js' );
+media.view.AudioDetails = require( './views/audio-details.js' );
+media.view.VideoDetails = require( './views/video-details.js' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./controllers/audio-details.js":2,"./controllers/video-details.js":8,"./models/post-media.js":9,"./views/audio-details.js":21,"./views/frame/audio-details.js":25,"./views/frame/media-details.js":26,"./views/frame/video-details.js":28,"./views/media-details.js":31,"./views/video-details.js":50}],2:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * The controller for the Audio Details state
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,9 +245,8 @@
</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 = AudioDetails;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./state.js":7}],3:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, Backbone, getUserSetting, setUserSetting */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.Library
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -295,6 +284,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var selectionSync = require( '../utils/selection-sync.js' ),
</span><span class="cx" style="display: block; padding: 0 10px"> State = require( './state.js' ),
</span><span class="cx" style="display: block; padding: 0 10px"> l10n = wp.media.view.l10n,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ getUserSetting = window.getUserSetting,
+ setUserSetting = window.setUserSetting,
</ins><span class="cx" style="display: block; padding: 0 10px"> Library;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> Library = State.extend({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -329,7 +320,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.set( 'library', wp.media.query() );
</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">- if ( ! (selection instanceof Selection) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( selection instanceof wp.media.model.Selection ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> props = selection;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! props ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -528,9 +519,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _.extend( Library.prototype, selectionSync );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Library;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../utils/selection-sync.js":10,"./state.js":7}],4:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.MediaLibrary
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -579,9 +569,8 @@
</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 = MediaLibrary;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./library.js":3}],5:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.Region
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -759,9 +748,8 @@
</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 = Region;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{}],6:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.StateMachine
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -884,9 +872,8 @@
</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 = StateMachine;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{}],7:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.State
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1126,9 +1113,8 @@
</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 = State;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{}],8:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * The controller for the Video Details state
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1158,9 +1144,8 @@
</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 = VideoDetails;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./state.js":7}],9:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals Backbone, _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Shared model class for audio and video. Updates the model after
</span><span class="cx" style="display: block; padding: 0 10px"> * "Add Audio|Video Source" and "Replace Audio|Video" states return
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1199,9 +1184,8 @@
</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 = PostMedia;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{}],10:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _ */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.selectionSync
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1266,9 +1250,8 @@
</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 = selectionSync;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{}],11:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _ */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.AttachmentCompat
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1352,9 +1335,8 @@
</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 = AttachmentCompat;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":51}],12:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.AttachmentFilters
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1431,9 +1413,8 @@
</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 = AttachmentFilters;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":51}],13:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.AttachmentFilters.All
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1523,9 +1504,8 @@
</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 = All;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../attachment-filters.js":12}],14:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * A filter dropdown for month/dates.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1566,9 +1546,8 @@
</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 = DateFilter;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../attachment-filters.js":12}],15:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.AttachmentFilters.Uploaded
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1627,9 +1606,8 @@
</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 = Uploaded;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../attachment-filters.js":12}],16:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Attachment
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2182,9 +2160,8 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":51}],17:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Attachment.Details
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2244,7 +2221,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> deleteAttachment: function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> event.preventDefault();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( confirm( l10n.warnDelete ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( window.confirm( l10n.warnDelete ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> this.model.destroy();
</span><span class="cx" style="display: block; padding: 0 10px"> // Keep focus inside media modal
</span><span class="cx" style="display: block; padding: 0 10px"> // after image is deleted
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2323,6 +2300,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"> module.exports = Details;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../attachment.js":16}],18:[function(require,module,exports){
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -2343,9 +2321,8 @@
</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 = Library;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../attachment.js":16}],19:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Attachments
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2618,7 +2595,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The scroll event occurs on the document, but the element
</span><span class="cx" style="display: block; padding: 0 10px"> // that should be checked is the document body.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( el == document ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( el === document ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> el = document.body;
</span><span class="cx" style="display: block; padding: 0 10px"> scrollTop = $(document).scrollTop();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2644,9 +2621,8 @@
</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 = Attachments;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./attachment.js":16,"./view.js":51}],20:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.AttachmentsBrowser
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2837,13 +2813,13 @@
</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">- if ( ! mediaTrash && ! confirm( l10n.warnBulkDelete ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! mediaTrash && ! window.confirm( l10n.warnBulkDelete ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( mediaTrash &&
</span><span class="cx" style="display: block; padding: 0 10px"> 'trash' !== selection.at( 0 ).get( 'status' ) &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ! confirm( l10n.warnBulkTrash ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ! window.confirm( l10n.warnBulkTrash ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</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">@@ -2891,7 +2867,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> click: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var removed = [], selection = this.controller.state().get( '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">- if ( ! selection.length || ! confirm( l10n.warnBulkDelete ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! selection.length || ! window.confirm( l10n.warnBulkDelete ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3104,9 +3080,8 @@
</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 = AttachmentsBrowser;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../attachment-compat.js":11,"../attachment-filters/all.js":13,"../attachment-filters/date.js":14,"../attachment-filters/uploaded.js":15,"../attachment/details.js":17,"../attachment/library.js":18,"../attachments.js":19,"../label.js":30,"../search.js":39,"../settings/attachment-display.js":41,"../sidebar.js":42,"../spinner.js":43,"../toolbar.js":44,"../uploader/inline.js":46,"../uploader/status.js":48,"../view.js":51}],21:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.AudioDetails
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3143,9 +3118,8 @@
</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 = AudioDetails;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./media-details":31}],22:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Button
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3233,6 +3207,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"> module.exports = Button;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":51}],23:[function(require,module,exports){
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -3281,9 +3256,8 @@
</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 = FocusManager;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":51}],24:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Frame
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3454,9 +3428,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _.extend( Frame.prototype, StateMachine.prototype );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Frame;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../controllers/region.js":5,"../controllers/state-machine.js":6,"../controllers/state.js":7,"./view.js":51}],25:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.MediaFrame.AudioDetails
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3532,9 +3505,8 @@
</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 = AudioDetails;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../../controllers/audio-details.js":2,"../../controllers/media-library.js":4,"../audio-details.js":21,"./media-details":26}],26:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.MediaFrame.MediaDetails
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3665,9 +3637,8 @@
</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 = MediaDetails;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../toolbar.js":44,"../view.js":51,"./select.js":27}],27:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.MediaFrame.Select
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3840,9 +3811,8 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../../controllers/library.js":3,"../attachments/browser.js":20,"../media-frame.js":32,"../toolbar/select.js":45,"../uploader/inline.js":46}],28:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.MediaFrame.VideoDetails
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3978,6 +3948,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"> module.exports = VideoDetails;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../../controllers/media-library.js":4,"../../controllers/video-details.js":8,"../video-details.js":50,"./media-details":26}],29:[function(require,module,exports){
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -4004,6 +3975,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"> module.exports = Iframe;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":51}],30:[function(require,module,exports){
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @class
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4030,9 +4002,8 @@
</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 = Label;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":51}],31:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.MediaDetails
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4116,7 +4087,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> setPlayer : function() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! this.players.length && this.media ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.players.push( new MediaElementPlayer( this.media, this.settings ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.players.push( new window.MediaElementPlayer( this.media, this.settings ) );
</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">@@ -4144,7 +4115,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> render: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> AttachmentDisplay.prototype.render.apply( this, arguments );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> setTimeout( _.bind( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> this.resetFocus();
</span><span class="cx" style="display: block; padding: 0 10px"> }, this ), 10 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4183,9 +4154,8 @@
</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 = MediaDetails;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./settings/attachment-display.js":41}],32:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.MediaFrame
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4438,9 +4408,8 @@
</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 = MediaFrame;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./frame.js":24,"./iframe.js":29,"./menu.js":34,"./modal.js":35,"./router.js":38,"./toolbar.js":44,"./uploader/window.js":49,"./view.js":51}],33:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.MenuItem
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4512,6 +4481,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"> module.exports = MenuItem;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":51}],34:[function(require,module,exports){
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -4628,9 +4598,8 @@
</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 = Menu;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./menu-item.js":33,"./priority-list.js":36}],35:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Modal
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4844,9 +4813,8 @@
</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 = Modal;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./focus-manager.js":23,"./view.js":51}],36:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.PriorityList
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4945,6 +4913,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"> module.exports = PriorityList;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":51}],37:[function(require,module,exports){
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -4971,6 +4940,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"> module.exports = RouterItem;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./menu-item.js":33}],38:[function(require,module,exports){
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -5008,9 +4978,8 @@
</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 = Router;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./menu.js":34,"./router-item.js":37}],39:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Search
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5058,9 +5027,8 @@
</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 = Search;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":51}],40:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Settings
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5168,7 +5136,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If the setting has a corresponding user setting,
</span><span class="cx" style="display: block; padding: 0 10px"> // update that as well.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( userSetting = $setting.data('userSetting') ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- setUserSetting( userSetting, value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ window.setUserSetting( userSetting, value );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5180,9 +5148,8 @@
</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 = Settings;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":51}],41:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Settings.AttachmentDisplay
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5275,6 +5242,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"> module.exports = AttachmentDisplay;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../settings.js":40}],42:[function(require,module,exports){
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -5293,9 +5261,8 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./priority-list.js":36}],43:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Spinner
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5332,9 +5299,8 @@
</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 = Spinner;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":51}],44:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals Backbone, _ */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Toolbar
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5495,9 +5461,8 @@
</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 = Toolbar;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./button.js":22,"./priority-list.js":36,"./view.js":51}],45:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Toolbar.Select
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5566,9 +5531,8 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../toolbar.js":44}],46:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.UploaderInline
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5699,9 +5663,8 @@
</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 = UploaderInline;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../view.js":51,"./status.js":48}],47:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.UploaderStatusError
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5719,9 +5682,8 @@
</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 = UploaderStatusError;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../view.js":51}],48:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.UploaderStatus
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5859,9 +5821,8 @@
</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 = UploaderStatus;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../view.js":51,"./status-error.js":47}],49:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.UploaderWindow
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5972,9 +5933,8 @@
</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 = UploaderWindow;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../view.js":51}],50:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.VideoDetails
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6016,9 +5976,8 @@
</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 = VideoDetails;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./media-details":31}],51:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.View
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6083,4 +6042,5 @@
</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 = View;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{}]},{},[1]);
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaaudiovideomanifestjs"></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.manifest.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.manifest.js 2015-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/audio-video.manifest.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,224 +1,215 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/* global wp, _wpMediaViewsL10n, _wpmejsSettings, MediaElementPlayer */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var media = wp.media,
+ baseSettings = window._wpmejsSettings || {},
+ l10n = window._wpMediaViewsL10n || {};
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-(function(_) {
- var media = wp.media,
- baseSettings = {},
- l10n = typeof _wpMediaViewsL10n === 'undefined' ? {} : _wpMediaViewsL10n;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * @mixin
+ */
+wp.media.mixin = {
+ mejsSettings: baseSettings,
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! _.isUndefined( window._wpmejsSettings ) ) {
- baseSettings = _wpmejsSettings;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ removeAllPlayers: function() {
+ var p;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( window.mejs && window.mejs.players ) {
+ for ( p in window.mejs.players ) {
+ window.mejs.players[p].pause();
+ this.removePlayer( window.mejs.players[p] );
+ }
+ }
+ },
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @mixin
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Override the MediaElement method for removing a player.
+ * MediaElement tries to pull the audio/video tag out of
+ * its container and re-add it to the DOM.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp.media.mixin = {
- mejsSettings: baseSettings,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ removePlayer: function(t) {
+ var featureIndex, feature;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- removeAllPlayers: function() {
- var p;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! t.options ) {
+ return;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( window.mejs && window.mejs.players ) {
- for ( p in window.mejs.players ) {
- window.mejs.players[p].pause();
- this.removePlayer( window.mejs.players[p] );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // invoke features cleanup
+ for ( featureIndex in t.options.features ) {
+ feature = t.options.features[featureIndex];
+ if ( t['clean' + feature] ) {
+ try {
+ t['clean' + feature](t);
+ } catch (e) {}
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Override the MediaElement method for removing a player.
- * MediaElement tries to pull the audio/video tag out of
- * its container and re-add it to the DOM.
- */
- removePlayer: function(t) {
- var featureIndex, feature;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! t.isDynamic ) {
+ t.$node.remove();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! t.options ) {
- return;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'native' !== t.media.pluginType ) {
+ t.media.remove();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // invoke features cleanup
- for ( featureIndex in t.options.features ) {
- feature = t.options.features[featureIndex];
- if ( t['clean' + feature] ) {
- try {
- t['clean' + feature](t);
- } catch (e) {}
- }
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ delete window.mejs.players[t.id];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! t.isDynamic ) {
- t.$node.remove();
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ t.container.remove();
+ t.globalUnbind();
+ delete t.node.player;
+ },
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'native' !== t.media.pluginType ) {
- t.media.remove();
- }
-
- delete window.mejs.players[t.id];
-
- t.container.remove();
- t.globalUnbind();
- delete t.node.player;
- },
-
- /**
- * Allows any class that has set 'player' to a MediaElementPlayer
- * instance to remove the player when listening to events.
- *
- * Examples: modal closes, shortcode properties are removed, etc.
- */
- unsetPlayers : function() {
- if ( this.players && this.players.length ) {
- _.each( this.players, function (player) {
- player.pause();
- wp.media.mixin.removePlayer( player );
- } );
- this.players = [];
- }
- }
- };
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Autowire "collection"-type shortcodes
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Allows any class that has set 'player' to a MediaElementPlayer
+ * instance to remove the player when listening to events.
+ *
+ * Examples: modal closes, shortcode properties are removed, etc.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp.media.playlist = new wp.media.collection({
- tag: 'playlist',
- editTitle : l10n.editPlaylistTitle,
- defaults : {
- id: wp.media.view.settings.post.id,
- style: 'light',
- tracklist: true,
- tracknumbers: true,
- images: true,
- artists: true,
- type: 'audio'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unsetPlayers : function() {
+ if ( this.players && this.players.length ) {
+ _.each( this.players, function (player) {
+ player.pause();
+ wp.media.mixin.removePlayer( player );
+ } );
+ this.players = [];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+};
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Shortcode modeling for audio
- * `edit()` prepares the shortcode for the media modal
- * `shortcode()` builds the new shortcode after update
- *
- * @namespace
- */
- wp.media.audio = {
- coerce : wp.media.coerce,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Autowire "collection"-type shortcodes
+ */
+wp.media.playlist = new wp.media.collection({
+ tag: 'playlist',
+ editTitle : l10n.editPlaylistTitle,
+ defaults : {
+ id: wp.media.view.settings.post.id,
+ style: 'light',
+ tracklist: true,
+ tracknumbers: true,
+ images: true,
+ artists: true,
+ type: 'audio'
+ }
+});
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- defaults : {
- id : wp.media.view.settings.post.id,
- src : '',
- loop : false,
- autoplay : false,
- preload : 'none',
- width : 400
- },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Shortcode modeling for audio
+ * `edit()` prepares the shortcode for the media modal
+ * `shortcode()` builds the new shortcode after update
+ *
+ * @namespace
+ */
+wp.media.audio = {
+ coerce : wp.media.coerce,
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- edit : function( data ) {
- var frame, shortcode = wp.shortcode.next( 'audio', data ).shortcode;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ defaults : {
+ id : wp.media.view.settings.post.id,
+ src : '',
+ loop : false,
+ autoplay : false,
+ preload : 'none',
+ width : 400
+ },
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- frame = wp.media({
- frame: 'audio',
- state: 'audio-details',
- metadata: _.defaults( shortcode.attrs.named, this.defaults )
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ edit : function( data ) {
+ var frame, shortcode = wp.shortcode.next( 'audio', data ).shortcode;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return frame;
- },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ frame = wp.media({
+ frame: 'audio',
+ state: 'audio-details',
+ metadata: _.defaults( shortcode.attrs.named, this.defaults )
+ });
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- shortcode : function( model ) {
- var content;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return frame;
+ },
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _.each( this.defaults, function( value, key ) {
- model[ key ] = self.coerce( model, key );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ shortcode : function( model ) {
+ var content;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( value === model[ key ] ) {
- delete model[ key ];
- }
- }, this );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _.each( this.defaults, function( value, key ) {
+ model[ key ] = this.coerce( model, key );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- content = model.content;
- delete model.content;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( value === model[ key ] ) {
+ delete model[ key ];
+ }
+ }, this );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new wp.shortcode({
- tag: 'audio',
- attrs: model,
- content: content
- });
- }
- };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ content = model.content;
+ delete model.content;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Shortcode modeling for video
- * `edit()` prepares the shortcode for the media modal
- * `shortcode()` builds the new shortcode after update
- *
- * @namespace
- */
- wp.media.video = {
- coerce : wp.media.coerce,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new wp.shortcode({
+ tag: 'audio',
+ attrs: model,
+ content: content
+ });
+ }
+};
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- defaults : {
- id : wp.media.view.settings.post.id,
- src : '',
- poster : '',
- loop : false,
- autoplay : false,
- preload : 'metadata',
- content : '',
- width : 640,
- height : 360
- },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Shortcode modeling for video
+ * `edit()` prepares the shortcode for the media modal
+ * `shortcode()` builds the new shortcode after update
+ *
+ * @namespace
+ */
+wp.media.video = {
+ coerce : wp.media.coerce,
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- edit : function( data ) {
- var frame,
- shortcode = wp.shortcode.next( 'video', data ).shortcode,
- attrs;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ defaults : {
+ id : wp.media.view.settings.post.id,
+ src : '',
+ poster : '',
+ loop : false,
+ autoplay : false,
+ preload : 'metadata',
+ content : '',
+ width : 640,
+ height : 360
+ },
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- attrs = shortcode.attrs.named;
- attrs.content = shortcode.content;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ edit : function( data ) {
+ var frame,
+ shortcode = wp.shortcode.next( 'video', data ).shortcode,
+ attrs;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- frame = wp.media({
- frame: 'video',
- state: 'video-details',
- metadata: _.defaults( attrs, this.defaults )
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ attrs = shortcode.attrs.named;
+ attrs.content = shortcode.content;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return frame;
- },
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ frame = wp.media({
+ frame: 'video',
+ state: 'video-details',
+ metadata: _.defaults( attrs, this.defaults )
+ });
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- shortcode : function( model ) {
- var content;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return frame;
+ },
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _.each( this.defaults, function( value, key ) {
- model[ key ] = this.coerce( model, key );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ shortcode : function( model ) {
+ var content;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( value === model[ key ] ) {
- delete model[ key ];
- }
- }, this );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _.each( this.defaults, function( value, key ) {
+ model[ key ] = this.coerce( model, key );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- content = model.content;
- delete model.content;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( value === model[ key ] ) {
+ delete model[ key ];
+ }
+ }, this );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return new wp.shortcode({
- tag: 'video',
- attrs: model,
- content: content
- });
- }
- };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ content = model.content;
+ delete model.content;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- media.model.PostMedia = require( './models/post-media.js' );
- media.controller.AudioDetails = require( './controllers/audio-details.js' );
- media.controller.VideoDetails = require( './controllers/video-details.js' );
- media.view.MediaFrame.MediaDetails = require( './views/frame/media-details.js' );
- media.view.MediaFrame.AudioDetails = require( './views/frame/audio-details.js' );
- media.view.MediaFrame.VideoDetails = require( './views/frame/video-details.js' );
- media.view.MediaDetails = require( './views/media-details.js' );
- media.view.AudioDetails = require( './views/audio-details.js' );
- media.view.VideoDetails = require( './views/video-details.js' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return new wp.shortcode({
+ tag: 'video',
+ attrs: model,
+ content: content
+ });
+ }
+};
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}(_));
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+media.model.PostMedia = require( './models/post-media.js' );
+media.controller.AudioDetails = require( './controllers/audio-details.js' );
+media.controller.VideoDetails = require( './controllers/video-details.js' );
+media.view.MediaFrame.MediaDetails = require( './views/frame/media-details.js' );
+media.view.MediaFrame.AudioDetails = require( './views/frame/audio-details.js' );
+media.view.MediaFrame.VideoDetails = require( './views/frame/video-details.js' );
+media.view.MediaDetails = require( './views/media-details.js' );
+media.view.AudioDetails = require( './views/audio-details.js' );
+media.view.VideoDetails = require( './views/video-details.js' );
</ins></span></pre></div>
<a id="trunksrcwpincludesjsmediacontrollersaudiodetailsjs"></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/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/controllers/audio-details.js 2015-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/controllers/audio-details.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * The controller for the Audio Details state
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,4 +26,4 @@
</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">-module.exports = AudioDetails;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = AudioDetails;
</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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/controllers/collection-add.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.CollectionAdd
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,4 +96,4 @@
</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">-module.exports = CollectionAdd;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = CollectionAdd;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/controllers/collection-edit.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp, jQuery, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.CollectionEdit
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,4 +157,4 @@
</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">-module.exports = CollectionEdit;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = CollectionEdit;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/controllers/cropper.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.Cropper
</span><span class="cx" style="display: block; padding: 0 10px"> *
</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"> this.$el.text(l10n.cropping);
</span><span class="cx" style="display: block; padding: 0 10px"> this.$el.attr('disabled', true);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> controller.state().doCrop( selection ).done( function( croppedImage ) {
</span><span class="cx" style="display: block; padding: 0 10px"> controller.trigger('cropped', croppedImage );
</span><span class="cx" style="display: block; padding: 0 10px"> controller.close();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,4 +114,4 @@
</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">-module.exports = Cropper;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Cropper;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/controllers/edit-attachment-metadata.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.EditAttachmentMetadata
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,4 +24,4 @@
</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">-module.exports = EditAttachmentMetadata;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = EditAttachmentMetadata;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/controllers/edit-image.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.EditImage
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,4 +73,4 @@
</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">-module.exports = EditImage;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = EditImage;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/controllers/embed.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.Embed
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,4 +132,4 @@
</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">-module.exports = Embed;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Embed;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/controllers/featured-image.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.FeaturedImage
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,4 +117,4 @@
</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">-module.exports = FeaturedImage;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = FeaturedImage;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/controllers/gallery-add.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * A state for selecting more images to add to a gallery.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,8 +49,9 @@
</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"> // If a library wasn't supplied, create a library of images.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! this.get('library') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! this.get('library') ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> this.set( 'library', wp.media.query({ type: 'image' }) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><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">@@ -64,8 +63,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var library = this.get('library'),
</span><span class="cx" style="display: block; padding: 0 10px"> edit = this.frame.state('gallery-edit').get('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">- if ( this.editLibrary && this.editLibrary !== edit )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( this.editLibrary && this.editLibrary !== edit ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> library.unobserve( this.editLibrary );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Accepts attachments that exist in the original library and
</span><span class="cx" style="display: block; padding: 0 10px"> // that do not exist in gallery's library.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,4 +84,4 @@
</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">-module.exports = GalleryAdd;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = GalleryAdd;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/controllers/gallery-edit.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.GalleryEdit
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,12 +59,15 @@
</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"> // If we haven't been provided a `library`, create a `Selection`.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! this.get('library') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! this.get('library') ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> this.set( 'library', new wp.media.model.Selection() );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><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">- if ( ! this.get('AttachmentView') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! this.get('AttachmentView') ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> this.set( 'AttachmentView', EditLibraryView );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+
</ins><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="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,4 +137,4 @@
</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">-module.exports = GalleryEdit;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = GalleryEdit;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/controllers/image-details.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.ImageDetails
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,4 +57,4 @@
</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">-module.exports = ImageDetails;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = ImageDetails;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/controllers/library.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, Backbone, getUserSetting, setUserSetting */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.Library
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,6 +35,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var selectionSync = require( '../utils/selection-sync.js' ),
</span><span class="cx" style="display: block; padding: 0 10px"> State = require( './state.js' ),
</span><span class="cx" style="display: block; padding: 0 10px"> l10n = wp.media.view.l10n,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ getUserSetting = window.getUserSetting,
+ setUserSetting = window.setUserSetting,
</ins><span class="cx" style="display: block; padding: 0 10px"> Library;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> Library = State.extend({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +71,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.set( 'library', wp.media.query() );
</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">- if ( ! (selection instanceof Selection) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( selection instanceof wp.media.model.Selection ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> props = selection;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! props ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -269,4 +269,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Make selectionSync available on any Media Library state.
</span><span class="cx" style="display: block; padding: 0 10px"> _.extend( Library.prototype, selectionSync );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-module.exports = Library;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Library;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/controllers/media-library.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.MediaLibrary
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,4 +45,4 @@
</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">-module.exports = MediaLibrary;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = MediaLibrary;
</ins></span></pre></div>
<a id="trunksrcwpincludesjsmediacontrollersregionjs"></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/region.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/controllers/region.js 2015-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/controllers/region.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.Region
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -176,4 +174,4 @@
</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">-module.exports = Region;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Region;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/controllers/replace-image.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.ReplaceImage
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,4 +103,4 @@
</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">-module.exports = ReplaceImage;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = ReplaceImage;
</ins></span></pre></div>
<a id="trunksrcwpincludesjsmediacontrollersstatemachinejs"></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/state-machine.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/controllers/state-machine.js 2015-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/controllers/state-machine.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.StateMachine
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,4 +119,4 @@
</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">-module.exports = StateMachine;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = StateMachine;
</ins></span></pre></div>
<a id="trunksrcwpincludesjsmediacontrollersstatejs"></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/state.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/controllers/state.js 2015-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/controllers/state.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.State
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -238,4 +236,4 @@
</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">-module.exports = State;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = State;
</ins></span></pre></div>
<a id="trunksrcwpincludesjsmediacontrollersvideodetailsjs"></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/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/controllers/video-details.js 2015-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/controllers/video-details.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * The controller for the Video Details state
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,4 +26,4 @@
</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">-module.exports = VideoDetails;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = VideoDetails;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/grid.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.EditAttachmentMetadata
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,9 +26,8 @@
</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 = EditAttachmentMetadata;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./state.js":6}],2:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.EditImage
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,9 +104,8 @@
</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 = EditImage;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../views/toolbar.js":46,"./state.js":6}],3:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, Backbone, getUserSetting, setUserSetting */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.Library
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,6 +143,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var selectionSync = require( '../utils/selection-sync.js' ),
</span><span class="cx" style="display: block; padding: 0 10px"> State = require( './state.js' ),
</span><span class="cx" style="display: block; padding: 0 10px"> l10n = wp.media.view.l10n,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ getUserSetting = window.getUserSetting,
+ setUserSetting = window.setUserSetting,
</ins><span class="cx" style="display: block; padding: 0 10px"> Library;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> Library = State.extend({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,7 +179,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.set( 'library', wp.media.query() );
</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">- if ( ! (selection instanceof Selection) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( selection instanceof wp.media.model.Selection ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> props = selection;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! props ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -380,9 +378,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _.extend( Library.prototype, selectionSync );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Library;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../utils/selection-sync.js":9,"./state.js":6}],4:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.Region
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -560,9 +557,8 @@
</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 = Region;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{}],5:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.StateMachine
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -685,9 +681,8 @@
</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 = StateMachine;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{}],6:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.State
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -927,25 +922,21 @@
</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 = State;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{}],7:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/* global wp, _wpMediaViewsL10n, MediaElementPlayer, _wpMediaGridSettings */
-(function (wp) {
- var media = wp.media;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var media = wp.media;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- media.controller.EditAttachmentMetadata = require( './controllers/edit-attachment-metadata.js' );
- media.view.MediaFrame.Manage = require( './views/frame/manage.js' );
- media.view.Attachment.Details.TwoColumn = require( './views/attachment/details-two-column.js' );
- media.view.MediaFrame.Manage.Router = require( './routers/manage.js' );
- media.view.EditImage.Details = require( './views/edit-image-details.js' );
- media.view.MediaFrame.EditAttachments = require( './views/frame/edit-attachments.js' );
- media.view.SelectModeToggleButton = require( './views/button/select-mode-toggle.js' );
- media.view.DeleteSelectedButton = require( './views/button/delete-selected.js' );
- media.view.DeleteSelectedPermanentlyButton = require( './views/button/delete-selected-permanently.js' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+media.controller.EditAttachmentMetadata = require( './controllers/edit-attachment-metadata.js' );
+media.view.MediaFrame.Manage = require( './views/frame/manage.js' );
+media.view.Attachment.Details.TwoColumn = require( './views/attachment/details-two-column.js' );
+media.view.MediaFrame.Manage.Router = require( './routers/manage.js' );
+media.view.EditImage.Details = require( './views/edit-image-details.js' );
+media.view.MediaFrame.EditAttachments = require( './views/frame/edit-attachments.js' );
+media.view.SelectModeToggleButton = require( './views/button/select-mode-toggle.js' );
+media.view.DeleteSelectedButton = require( './views/button/delete-selected.js' );
+media.view.DeleteSelectedPermanentlyButton = require( './views/button/delete-selected-permanently.js' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}(wp));
</del><span class="cx" style="display: block; padding: 0 10px"> },{"./controllers/edit-attachment-metadata.js":1,"./routers/manage.js":8,"./views/attachment/details-two-column.js":16,"./views/button/delete-selected-permanently.js":22,"./views/button/delete-selected.js":23,"./views/button/select-mode-toggle.js":24,"./views/edit-image-details.js":25,"./views/frame/edit-attachments.js":29,"./views/frame/manage.js":30}],8:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals jQuery, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * A router for handling the browser history and application state.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -990,9 +981,8 @@
</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 = Router;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{}],9:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _ */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.selectionSync
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1057,9 +1047,8 @@
</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 = selectionSync;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{}],10:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _ */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.AttachmentCompat
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1143,9 +1132,8 @@
</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 = AttachmentCompat;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":51}],11:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.AttachmentFilters
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1222,9 +1210,8 @@
</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 = AttachmentFilters;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":51}],12:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.AttachmentFilters.All
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1314,9 +1301,8 @@
</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 = All;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../attachment-filters.js":11}],13:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * A filter dropdown for month/dates.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1357,9 +1343,8 @@
</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 = DateFilter;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../attachment-filters.js":11}],14:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.AttachmentFilters.Uploaded
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1418,9 +1403,8 @@
</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 = Uploaded;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../attachment-filters.js":11}],15:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Attachment
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1973,9 +1957,8 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":51}],16:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * A similar view to media.view.Attachment.Details
</span><span class="cx" style="display: block; padding: 0 10px"> * for use in the Edit Attachment modal.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2010,15 +1993,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp.media.mixin.removeAllPlayers();
</span><span class="cx" style="display: block; padding: 0 10px"> this.$( 'audio, video' ).each( function (i, elem) {
</span><span class="cx" style="display: block; padding: 0 10px"> var el = MediaDetails.prepareSrc( elem );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- new MediaElementPlayer( el, wp.media.mixin.mejsSettings );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ new window.MediaElementPlayer( el, wp.media.mixin.mejsSettings );
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = TwoColumn;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../media-details.js":33,"./details.js":17}],17:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Attachment.Details
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2078,7 +2060,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> deleteAttachment: function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> event.preventDefault();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( confirm( l10n.warnDelete ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( window.confirm( l10n.warnDelete ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> this.model.destroy();
</span><span class="cx" style="display: block; padding: 0 10px"> // Keep focus inside media modal
</span><span class="cx" style="display: block; padding: 0 10px"> // after image is deleted
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2157,6 +2139,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"> module.exports = Details;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../attachment.js":15}],18:[function(require,module,exports){
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -2177,9 +2160,8 @@
</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 = Library;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../attachment.js":15}],19:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Attachments
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2452,7 +2434,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The scroll event occurs on the document, but the element
</span><span class="cx" style="display: block; padding: 0 10px"> // that should be checked is the document body.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( el == document ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( el === document ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> el = document.body;
</span><span class="cx" style="display: block; padding: 0 10px"> scrollTop = $(document).scrollTop();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2478,9 +2460,8 @@
</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 = Attachments;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./attachment.js":15,"./view.js":51}],20:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.AttachmentsBrowser
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2671,13 +2652,13 @@
</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">- if ( ! mediaTrash && ! confirm( l10n.warnBulkDelete ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! mediaTrash && ! window.confirm( l10n.warnBulkDelete ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( mediaTrash &&
</span><span class="cx" style="display: block; padding: 0 10px"> 'trash' !== selection.at( 0 ).get( 'status' ) &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ! confirm( l10n.warnBulkTrash ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ! window.confirm( l10n.warnBulkTrash ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</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">@@ -2725,7 +2706,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> click: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var removed = [], selection = this.controller.state().get( '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">- if ( ! selection.length || ! confirm( l10n.warnBulkDelete ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! selection.length || ! window.confirm( l10n.warnBulkDelete ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2938,9 +2919,8 @@
</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 = AttachmentsBrowser;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../attachment-compat.js":10,"../attachment-filters/all.js":12,"../attachment-filters/date.js":13,"../attachment-filters/uploaded.js":14,"../attachment/details.js":17,"../attachment/library.js":18,"../attachments.js":19,"../label.js":32,"../search.js":41,"../settings/attachment-display.js":43,"../sidebar.js":44,"../spinner.js":45,"../toolbar.js":46,"../uploader/inline.js":47,"../uploader/status.js":49,"../view.js":51}],21:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Button
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3028,6 +3008,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"> module.exports = Button;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":51}],22:[function(require,module,exports){
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * When MEDIA_TRASH is true, a button that handles bulk Delete Permanently logic
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3072,9 +3053,8 @@
</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 = DeleteSelectedPermanently;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../button.js":21,"./delete-selected.js":23}],23:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * A button that handles bulk Delete/Trash logic
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3124,9 +3104,8 @@
</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 = DeleteSelected;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../button.js":21}],24:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> var Button = require( '../button.js' ),
</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"> SelectModeToggle;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3180,6 +3159,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"> module.exports = SelectModeToggle;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../button.js":21}],25:[function(require,module,exports){
</span><span class="cx" style="display: block; padding: 0 10px"> var View = require( './view.js' ),
</span><span class="cx" style="display: block; padding: 0 10px"> EditImage = require( './edit-image.js' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3205,9 +3185,8 @@
</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 = Details;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./edit-image.js":26,"./view.js":51}],26:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> var View = require( './view.js' ),
</span><span class="cx" style="display: block; padding: 0 10px"> EditImage;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3259,6 +3238,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"> module.exports = EditImage;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":51}],27:[function(require,module,exports){
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -3307,9 +3287,8 @@
</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 = FocusManager;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":51}],28:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Frame
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3480,9 +3459,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _.extend( Frame.prototype, StateMachine.prototype );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Frame;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../controllers/region.js":4,"../controllers/state-machine.js":5,"../controllers/state.js":6,"./view.js":51}],29:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * A frame for editing the details of a specific media item.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3727,9 +3705,8 @@
</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 = EditAttachments;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../../controllers/edit-attachment-metadata.js":1,"../../controllers/edit-image.js":2,"../attachment-compat.js":10,"../attachment/details-two-column.js":16,"../edit-image-details.js":25,"../frame.js":28,"../media-frame.js":34,"../modal.js":37}],30:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.MediaFrame.Manage
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3967,7 +3944,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Verify pushState support and activate
</span><span class="cx" style="display: block; padding: 0 10px"> if ( window.history && window.history.pushState ) {
</span><span class="cx" style="display: block; padding: 0 10px"> Backbone.history.start( {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- root: _wpMediaGridSettings.adminUrl,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ root: window._wpMediaGridSettings.adminUrl,
</ins><span class="cx" style="display: block; padding: 0 10px"> pushState: true
</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">@@ -3975,6 +3952,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"> module.exports = Manage;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../../controllers/library.js":3,"../../routers/manage.js":8,"../attachments/browser.js":20,"../media-frame.js":34,"../uploader/window.js":50}],31:[function(require,module,exports){
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -4001,6 +3979,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"> module.exports = Iframe;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":51}],32:[function(require,module,exports){
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @class
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4027,9 +4006,8 @@
</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 = Label;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":51}],33:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.MediaDetails
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4113,7 +4091,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> setPlayer : function() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! this.players.length && this.media ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.players.push( new MediaElementPlayer( this.media, this.settings ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.players.push( new window.MediaElementPlayer( this.media, this.settings ) );
</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">@@ -4141,7 +4119,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> render: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> AttachmentDisplay.prototype.render.apply( this, arguments );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> setTimeout( _.bind( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> this.resetFocus();
</span><span class="cx" style="display: block; padding: 0 10px"> }, this ), 10 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4180,9 +4158,8 @@
</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 = MediaDetails;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./settings/attachment-display.js":43}],34:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.MediaFrame
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4435,9 +4412,8 @@
</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 = MediaFrame;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./frame.js":28,"./iframe.js":31,"./menu.js":36,"./modal.js":37,"./router.js":40,"./toolbar.js":46,"./uploader/window.js":50,"./view.js":51}],35:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.MenuItem
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4509,6 +4485,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"> module.exports = MenuItem;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":51}],36:[function(require,module,exports){
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -4625,9 +4602,8 @@
</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 = Menu;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./menu-item.js":35,"./priority-list.js":38}],37:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Modal
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4841,9 +4817,8 @@
</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 = Modal;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./focus-manager.js":27,"./view.js":51}],38:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.PriorityList
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4942,6 +4917,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"> module.exports = PriorityList;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":51}],39:[function(require,module,exports){
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -4968,6 +4944,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"> module.exports = RouterItem;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./menu-item.js":35}],40:[function(require,module,exports){
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -5005,9 +4982,8 @@
</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 = Router;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./menu.js":36,"./router-item.js":39}],41:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Search
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5055,9 +5031,8 @@
</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 = Search;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":51}],42:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Settings
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5165,7 +5140,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If the setting has a corresponding user setting,
</span><span class="cx" style="display: block; padding: 0 10px"> // update that as well.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( userSetting = $setting.data('userSetting') ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- setUserSetting( userSetting, value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ window.setUserSetting( userSetting, value );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5177,9 +5152,8 @@
</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 = Settings;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":51}],43:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Settings.AttachmentDisplay
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5272,6 +5246,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"> module.exports = AttachmentDisplay;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../settings.js":42}],44:[function(require,module,exports){
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -5290,9 +5265,8 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./priority-list.js":38}],45:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Spinner
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5329,9 +5303,8 @@
</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 = Spinner;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":51}],46:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals Backbone, _ */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Toolbar
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5492,9 +5465,8 @@
</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 = Toolbar;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./button.js":21,"./priority-list.js":38,"./view.js":51}],47:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.UploaderInline
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5625,9 +5597,8 @@
</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 = UploaderInline;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../view.js":51,"./status.js":49}],48:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.UploaderStatusError
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5645,9 +5616,8 @@
</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 = UploaderStatusError;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../view.js":51}],49:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.UploaderStatus
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5785,9 +5755,8 @@
</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 = UploaderStatus;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../view.js":51,"./status-error.js":48}],50:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.UploaderWindow
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5898,9 +5867,8 @@
</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 = UploaderWindow;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../view.js":51}],51:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.View
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5965,4 +5933,5 @@
</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 = View;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{}]},{},[7]);
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediagridmanifestjs"></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.manifest.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/grid.manifest.js 2015-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/grid.manifest.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,15 +1,11 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/* global wp, _wpMediaViewsL10n, MediaElementPlayer, _wpMediaGridSettings */
-(function (wp) {
- var media = wp.media;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var media = wp.media;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- media.controller.EditAttachmentMetadata = require( './controllers/edit-attachment-metadata.js' );
- media.view.MediaFrame.Manage = require( './views/frame/manage.js' );
- media.view.Attachment.Details.TwoColumn = require( './views/attachment/details-two-column.js' );
- media.view.MediaFrame.Manage.Router = require( './routers/manage.js' );
- media.view.EditImage.Details = require( './views/edit-image-details.js' );
- media.view.MediaFrame.EditAttachments = require( './views/frame/edit-attachments.js' );
- media.view.SelectModeToggleButton = require( './views/button/select-mode-toggle.js' );
- media.view.DeleteSelectedButton = require( './views/button/delete-selected.js' );
- media.view.DeleteSelectedPermanentlyButton = require( './views/button/delete-selected-permanently.js' );
-
-}(wp));
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+media.controller.EditAttachmentMetadata = require( './controllers/edit-attachment-metadata.js' );
+media.view.MediaFrame.Manage = require( './views/frame/manage.js' );
+media.view.Attachment.Details.TwoColumn = require( './views/attachment/details-two-column.js' );
+media.view.MediaFrame.Manage.Router = require( './routers/manage.js' );
+media.view.EditImage.Details = require( './views/edit-image-details.js' );
+media.view.MediaFrame.EditAttachments = require( './views/frame/edit-attachments.js' );
+media.view.SelectModeToggleButton = require( './views/button/select-mode-toggle.js' );
+media.view.DeleteSelectedButton = require( './views/button/delete-selected.js' );
+media.view.DeleteSelectedPermanentlyButton = require( './views/button/delete-selected-permanently.js' );
</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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/models/attachment.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals jQuery, Backbone, _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.model.Attachment
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +126,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $.Deferred().rejectWith( this ).promise();
</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">- return media.post( 'save-attachment-compat', _.defaults({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return wp.media.post( 'save-attachment-compat', _.defaults({
</ins><span class="cx" style="display: block; padding: 0 10px"> id: this.id,
</span><span class="cx" style="display: block; padding: 0 10px"> nonce: this.get('nonces').update,
</span><span class="cx" style="display: block; padding: 0 10px"> post_id: wp.media.model.settings.post.id
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,4 +163,4 @@
</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">-module.exports = Attachment;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Attachment;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/models/attachments.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals jQuery, Backbone, _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.model.Attachments
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -323,8 +321,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // checking if we're still mirroring that collection when
</span><span class="cx" style="display: block; padding: 0 10px"> // the request resolves.
</span><span class="cx" style="display: block; padding: 0 10px"> mirroring.more( options ).done( function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( this === attachments.mirroring )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( this === attachments.mirroring ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> deferred.resolveWith( this );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return deferred.promise();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -532,4 +531,4 @@
</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">-module.exports = Attachments;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Attachments;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/models/post-image.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals jQuery, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.model.PostImage
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,4 +151,4 @@
</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">-module.exports = PostImage;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = PostImage;
</ins></span></pre></div>
<a id="trunksrcwpincludesjsmediamodelspostmediajs"></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-media.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-media.js 2015-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/models/post-media.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals Backbone, _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Shared model class for audio and video. Updates the model after
</span><span class="cx" style="display: block; padding: 0 10px"> * "Add Audio|Video Source" and "Replace Audio|Video" states return
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,4 +35,4 @@
</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">-module.exports = PostMedia;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = PostMedia;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/models/query.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals jQuery, _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.model.Query
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -305,4 +303,4 @@
</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">-module.exports = Query;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Query;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/models/selection.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _ */
-
</del><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="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,4 +92,4 @@
</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">-module.exports = Selection;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Selection;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/models.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,239 +1,235 @@
</span><span class="cx" style="display: block; padding: 0 10px"> (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/* global _wpMediaModelsL10n:false */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var $ = jQuery,
+ Attachment, Attachments, l10n, media;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> window.wp = window.wp || {};
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-(function($){
- var Attachment, Attachments, l10n, media;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Create and return a media frame.
+ *
+ * Handles the default media experience.
+ *
+ * @param {object} attributes The properties passed to the main media controller.
+ * @return {wp.media.view.MediaFrame} A media workflow.
+ */
+media = wp.media = function( attributes ) {
+ var MediaFrame = media.view.MediaFrame,
+ frame;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Create and return a media frame.
- *
- * Handles the default media experience.
- *
- * @param {object} attributes The properties passed to the main media controller.
- * @return {wp.media.view.MediaFrame} A media workflow.
- */
- media = wp.media = function( attributes ) {
- var MediaFrame = media.view.MediaFrame,
- frame;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! MediaFrame ) {
+ return;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! MediaFrame ) {
- return;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ attributes = _.defaults( attributes || {}, {
+ frame: 'select'
+ });
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- attributes = _.defaults( attributes || {}, {
- frame: 'select'
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'select' === attributes.frame && MediaFrame.Select ) {
+ frame = new MediaFrame.Select( attributes );
+ } else if ( 'post' === attributes.frame && MediaFrame.Post ) {
+ frame = new MediaFrame.Post( attributes );
+ } else if ( 'manage' === attributes.frame && MediaFrame.Manage ) {
+ frame = new MediaFrame.Manage( attributes );
+ } else if ( 'image' === attributes.frame && MediaFrame.ImageDetails ) {
+ frame = new MediaFrame.ImageDetails( attributes );
+ } else if ( 'audio' === attributes.frame && MediaFrame.AudioDetails ) {
+ frame = new MediaFrame.AudioDetails( attributes );
+ } else if ( 'video' === attributes.frame && MediaFrame.VideoDetails ) {
+ frame = new MediaFrame.VideoDetails( attributes );
+ } else if ( 'edit-attachments' === attributes.frame && MediaFrame.EditAttachments ) {
+ frame = new MediaFrame.EditAttachments( attributes );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'select' === attributes.frame && MediaFrame.Select ) {
- frame = new MediaFrame.Select( attributes );
- } else if ( 'post' === attributes.frame && MediaFrame.Post ) {
- frame = new MediaFrame.Post( attributes );
- } else if ( 'manage' === attributes.frame && MediaFrame.Manage ) {
- frame = new MediaFrame.Manage( attributes );
- } else if ( 'image' === attributes.frame && MediaFrame.ImageDetails ) {
- frame = new MediaFrame.ImageDetails( attributes );
- } else if ( 'audio' === attributes.frame && MediaFrame.AudioDetails ) {
- frame = new MediaFrame.AudioDetails( attributes );
- } else if ( 'video' === attributes.frame && MediaFrame.VideoDetails ) {
- frame = new MediaFrame.VideoDetails( attributes );
- } else if ( 'edit-attachments' === attributes.frame && MediaFrame.EditAttachments ) {
- frame = new MediaFrame.EditAttachments( attributes );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ delete attributes.frame;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- delete attributes.frame;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ media.frame = frame;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- media.frame = frame;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return frame;
+};
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return frame;
- };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+_.extend( media, { model: {}, view: {}, controller: {}, frames: {} });
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _.extend( media, { model: {}, view: {}, controller: {}, frames: {} });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Link any localized strings.
+l10n = media.model.l10n = window._wpMediaModelsL10n || {};
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Link any localized strings.
- l10n = media.model.l10n = typeof _wpMediaModelsL10n === 'undefined' ? {} : _wpMediaModelsL10n;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Link any settings.
+media.model.settings = l10n.settings || {};
+delete l10n.settings;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Link any settings.
- media.model.settings = l10n.settings || {};
- delete l10n.settings;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Attachments = media.model.Attachments = require( './models/attachments.js' );
+Attachment = media.model.Attachment = require( './models/attachment.js' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- Attachments = media.model.Attachments = require( './models/attachments.js' );
- Attachment = media.model.Attachment = require( './models/attachment.js' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+media.model.Query = require( './models/query.js' );
+media.model.PostImage = require( './models/post-image.js' );
+media.model.Selection = require( './models/selection.js' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- media.model.Query = require( './models/query.js' );
- media.model.PostImage = require( './models/post-image.js' );
- media.model.Selection = require( './models/selection.js' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * ========================================================================
+ * UTILITIES
+ * ========================================================================
+ */
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * A basic equality comparator for Backbone models.
+ *
+ * Used to order models within a collection - @see wp.media.model.Attachments.comparator().
+ *
+ * @param {mixed} a The primary parameter to compare.
+ * @param {mixed} b The primary parameter to compare.
+ * @param {string} ac The fallback parameter to compare, a's cid.
+ * @param {string} bc The fallback parameter to compare, b's cid.
+ * @return {number} -1: a should come before b.
+ * 0: a and b are of the same rank.
+ * 1: b should come before a.
+ */
+media.compare = function( a, b, ac, bc ) {
+ if ( _.isEqual( a, b ) ) {
+ return ac === bc ? 0 : (ac > bc ? -1 : 1);
+ } else {
+ return a > b ? -1 : 1;
+ }
+};
+
+_.extend( media, {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * ========================================================================
- * UTILITIES
- * ========================================================================
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * media.template( id )
+ *
+ * Fetch a JavaScript template for an id, and return a templating function for it.
+ *
+ * See wp.template() in `wp-includes/js/wp-util.js`.
+ *
+ * @borrows wp.template as template
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ template: wp.template,
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * A basic equality comparator for Backbone models.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * media.post( [action], [data] )
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Used to order models within a collection - @see wp.media.model.Attachments.comparator().
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Sends a POST request to WordPress.
+ * See wp.ajax.post() in `wp-includes/js/wp-util.js`.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param {mixed} a The primary parameter to compare.
- * @param {mixed} b The primary parameter to compare.
- * @param {string} ac The fallback parameter to compare, a's cid.
- * @param {string} bc The fallback parameter to compare, b's cid.
- * @return {number} -1: a should come before b.
- * 0: a and b are of the same rank.
- * 1: b should come before a.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @borrows wp.ajax.post as post
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- media.compare = function( a, b, ac, bc ) {
- if ( _.isEqual( a, b ) ) {
- return ac === bc ? 0 : (ac > bc ? -1 : 1);
- } else {
- return a > b ? -1 : 1;
- }
- };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ post: wp.ajax.post,
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _.extend( media, {
- /**
- * media.template( id )
- *
- * Fetch a JavaScript template for an id, and return a templating function for it.
- *
- * See wp.template() in `wp-includes/js/wp-util.js`.
- *
- * @borrows wp.template as template
- */
- template: wp.template,
-
- /**
- * media.post( [action], [data] )
- *
- * Sends a POST request to WordPress.
- * See wp.ajax.post() in `wp-includes/js/wp-util.js`.
- *
- * @borrows wp.ajax.post as post
- */
- post: wp.ajax.post,
-
- /**
- * media.ajax( [action], [options] )
- *
- * Sends an XHR request to WordPress.
- * See wp.ajax.send() in `wp-includes/js/wp-util.js`.
- *
- * @borrows wp.ajax.send as ajax
- */
- ajax: wp.ajax.send,
-
- /**
- * Scales a set of dimensions to fit within bounding dimensions.
- *
- * @param {Object} dimensions
- * @returns {Object}
- */
- fit: function( dimensions ) {
- var width = dimensions.width,
- height = dimensions.height,
- maxWidth = dimensions.maxWidth,
- maxHeight = dimensions.maxHeight,
- constraint;
-
- // Compare ratios between the two values to determine which
- // max to constrain by. If a max value doesn't exist, then the
- // opposite side is the constraint.
- if ( ! _.isUndefined( maxWidth ) && ! _.isUndefined( maxHeight ) ) {
- constraint = ( width / height > maxWidth / maxHeight ) ? 'width' : 'height';
- } else if ( _.isUndefined( maxHeight ) ) {
- constraint = 'width';
- } else if ( _.isUndefined( maxWidth ) && height > maxHeight ) {
- constraint = 'height';
- }
-
- // If the value of the constrained side is larger than the max,
- // then scale the values. Otherwise return the originals; they fit.
- if ( 'width' === constraint && width > maxWidth ) {
- return {
- width : maxWidth,
- height: Math.round( maxWidth * height / width )
- };
- } else if ( 'height' === constraint && height > maxHeight ) {
- return {
- width : Math.round( maxHeight * width / height ),
- height: maxHeight
- };
- } else {
- return {
- width : width,
- height: height
- };
- }
- },
- /**
- * Truncates a string by injecting an ellipsis into the middle.
- * Useful for filenames.
- *
- * @param {String} string
- * @param {Number} [length=30]
- * @param {String} [replacement=…]
- * @returns {String} The string, unless length is greater than string.length.
- */
- truncate: function( string, length, replacement ) {
- length = length || 30;
- replacement = replacement || '…';
-
- if ( string.length <= length ) {
- return string;
- }
-
- return string.substr( 0, length / 2 ) + replacement + string.substr( -1 * length / 2 );
- }
- });
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * ========================================================================
- * MODELS
- * ========================================================================
- */
- /**
- * wp.media.attachment
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * media.ajax( [action], [options] )
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @static
- * @param {String} id A string used to identify a model.
- * @returns {wp.media.model.Attachment}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Sends an XHR request to WordPress.
+ * See wp.ajax.send() in `wp-includes/js/wp-util.js`.
+ *
+ * @borrows wp.ajax.send as ajax
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- media.attachment = function( id ) {
- return Attachment.get( id );
- };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ajax: wp.ajax.send,
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * A collection of all attachments that have been fetched from the server.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Scales a set of dimensions to fit within bounding dimensions.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @static
- * @member {wp.media.model.Attachments}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param {Object} dimensions
+ * @returns {Object}
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- Attachments.all = new Attachments();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fit: function( dimensions ) {
+ var width = dimensions.width,
+ height = dimensions.height,
+ maxWidth = dimensions.maxWidth,
+ maxHeight = dimensions.maxHeight,
+ constraint;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Compare ratios between the two values to determine which
+ // max to constrain by. If a max value doesn't exist, then the
+ // opposite side is the constraint.
+ if ( ! _.isUndefined( maxWidth ) && ! _.isUndefined( maxHeight ) ) {
+ constraint = ( width / height > maxWidth / maxHeight ) ? 'width' : 'height';
+ } else if ( _.isUndefined( maxHeight ) ) {
+ constraint = 'width';
+ } else if ( _.isUndefined( maxWidth ) && height > maxHeight ) {
+ constraint = 'height';
+ }
+
+ // If the value of the constrained side is larger than the max,
+ // then scale the values. Otherwise return the originals; they fit.
+ if ( 'width' === constraint && width > maxWidth ) {
+ return {
+ width : maxWidth,
+ height: Math.round( maxWidth * height / width )
+ };
+ } else if ( 'height' === constraint && height > maxHeight ) {
+ return {
+ width : Math.round( maxHeight * width / height ),
+ height: maxHeight
+ };
+ } else {
+ return {
+ width : width,
+ height: height
+ };
+ }
+ },
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * wp.media.query
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Truncates a string by injecting an ellipsis into the middle.
+ * Useful for filenames.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Shorthand for creating a new Attachments Query.
- *
- * @param {object} [props]
- * @returns {wp.media.model.Attachments}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param {String} string
+ * @param {Number} [length=30]
+ * @param {String} [replacement=…]
+ * @returns {String} The string, unless length is greater than string.length.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- media.query = function( props ) {
- return new Attachments( null, {
- props: _.extend( _.defaults( props || {}, { orderby: 'date' } ), { query: true } )
- });
- };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ truncate: function( string, length, replacement ) {
+ length = length || 30;
+ replacement = replacement || '…';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Clean up. Prevents mobile browsers caching
- $(window).on('unload', function(){
- window.wp = null;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( string.length <= length ) {
+ return string;
+ }
+
+ return string.substr( 0, length / 2 ) + replacement + string.substr( -1 * length / 2 );
+ }
+});
+
+/**
+ * ========================================================================
+ * MODELS
+ * ========================================================================
+ */
+/**
+ * wp.media.attachment
+ *
+ * @static
+ * @param {String} id A string used to identify a model.
+ * @returns {wp.media.model.Attachment}
+ */
+media.attachment = function( id ) {
+ return Attachment.get( id );
+};
+
+/**
+ * A collection of all attachments that have been fetched from the server.
+ *
+ * @static
+ * @member {wp.media.model.Attachments}
+ */
+Attachments.all = new Attachments();
+
+/**
+ * wp.media.query
+ *
+ * Shorthand for creating a new Attachments Query.
+ *
+ * @param {object} [props]
+ * @returns {wp.media.model.Attachments}
+ */
+media.query = function( props ) {
+ return new Attachments( null, {
+ props: _.extend( _.defaults( props || {}, { orderby: 'date' } ), { query: true } )
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+};
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}(jQuery));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Clean up. Prevents mobile browsers caching
+$(window).on('unload', function(){
+ window.wp = null;
+});
+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./models/attachment.js":2,"./models/attachments.js":3,"./models/post-image.js":4,"./models/query.js":5,"./models/selection.js":6}],2:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals jQuery, Backbone, _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.model.Attachment
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -362,7 +358,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $.Deferred().rejectWith( this ).promise();
</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">- return media.post( 'save-attachment-compat', _.defaults({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return wp.media.post( 'save-attachment-compat', _.defaults({
</ins><span class="cx" style="display: block; padding: 0 10px"> id: this.id,
</span><span class="cx" style="display: block; padding: 0 10px"> nonce: this.get('nonces').update,
</span><span class="cx" style="display: block; padding: 0 10px"> post_id: wp.media.model.settings.post.id
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -400,9 +396,8 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./attachments.js":3}],3:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals jQuery, Backbone, _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.model.Attachments
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -726,8 +721,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // checking if we're still mirroring that collection when
</span><span class="cx" style="display: block; padding: 0 10px"> // the request resolves.
</span><span class="cx" style="display: block; padding: 0 10px"> mirroring.more( options ).done( function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( this === attachments.mirroring )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( this === attachments.mirroring ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> deferred.resolveWith( this );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return deferred.promise();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -936,9 +932,8 @@
</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 = Attachments;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./attachment.js":2,"./query.js":5}],4:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals jQuery, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.model.PostImage
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1093,9 +1088,8 @@
</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 = PostImage;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./attachment":2}],5:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals jQuery, _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.model.Query
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1402,9 +1396,8 @@
</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 = Query;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./attachments.js":3}],6:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _ */
-
</del><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="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1500,4 +1493,5 @@
</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 = Selection;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./attachments.js":3}]},{},[1]);
</span></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/models.manifest.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,232 +1,229 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/* global _wpMediaModelsL10n:false */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var $ = jQuery,
+ Attachment, Attachments, l10n, media;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> window.wp = window.wp || {};
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-(function($){
- var Attachment, Attachments, l10n, media;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Create and return a media frame.
+ *
+ * Handles the default media experience.
+ *
+ * @param {object} attributes The properties passed to the main media controller.
+ * @return {wp.media.view.MediaFrame} A media workflow.
+ */
+media = wp.media = function( attributes ) {
+ var MediaFrame = media.view.MediaFrame,
+ frame;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Create and return a media frame.
- *
- * Handles the default media experience.
- *
- * @param {object} attributes The properties passed to the main media controller.
- * @return {wp.media.view.MediaFrame} A media workflow.
- */
- media = wp.media = function( attributes ) {
- var MediaFrame = media.view.MediaFrame,
- frame;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! MediaFrame ) {
+ return;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! MediaFrame ) {
- return;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ attributes = _.defaults( attributes || {}, {
+ frame: 'select'
+ });
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- attributes = _.defaults( attributes || {}, {
- frame: 'select'
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'select' === attributes.frame && MediaFrame.Select ) {
+ frame = new MediaFrame.Select( attributes );
+ } else if ( 'post' === attributes.frame && MediaFrame.Post ) {
+ frame = new MediaFrame.Post( attributes );
+ } else if ( 'manage' === attributes.frame && MediaFrame.Manage ) {
+ frame = new MediaFrame.Manage( attributes );
+ } else if ( 'image' === attributes.frame && MediaFrame.ImageDetails ) {
+ frame = new MediaFrame.ImageDetails( attributes );
+ } else if ( 'audio' === attributes.frame && MediaFrame.AudioDetails ) {
+ frame = new MediaFrame.AudioDetails( attributes );
+ } else if ( 'video' === attributes.frame && MediaFrame.VideoDetails ) {
+ frame = new MediaFrame.VideoDetails( attributes );
+ } else if ( 'edit-attachments' === attributes.frame && MediaFrame.EditAttachments ) {
+ frame = new MediaFrame.EditAttachments( attributes );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'select' === attributes.frame && MediaFrame.Select ) {
- frame = new MediaFrame.Select( attributes );
- } else if ( 'post' === attributes.frame && MediaFrame.Post ) {
- frame = new MediaFrame.Post( attributes );
- } else if ( 'manage' === attributes.frame && MediaFrame.Manage ) {
- frame = new MediaFrame.Manage( attributes );
- } else if ( 'image' === attributes.frame && MediaFrame.ImageDetails ) {
- frame = new MediaFrame.ImageDetails( attributes );
- } else if ( 'audio' === attributes.frame && MediaFrame.AudioDetails ) {
- frame = new MediaFrame.AudioDetails( attributes );
- } else if ( 'video' === attributes.frame && MediaFrame.VideoDetails ) {
- frame = new MediaFrame.VideoDetails( attributes );
- } else if ( 'edit-attachments' === attributes.frame && MediaFrame.EditAttachments ) {
- frame = new MediaFrame.EditAttachments( attributes );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ delete attributes.frame;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- delete attributes.frame;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ media.frame = frame;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- media.frame = frame;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return frame;
+};
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return frame;
- };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+_.extend( media, { model: {}, view: {}, controller: {}, frames: {} });
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _.extend( media, { model: {}, view: {}, controller: {}, frames: {} });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Link any localized strings.
+l10n = media.model.l10n = window._wpMediaModelsL10n || {};
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Link any localized strings.
- l10n = media.model.l10n = typeof _wpMediaModelsL10n === 'undefined' ? {} : _wpMediaModelsL10n;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Link any settings.
+media.model.settings = l10n.settings || {};
+delete l10n.settings;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Link any settings.
- media.model.settings = l10n.settings || {};
- delete l10n.settings;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Attachments = media.model.Attachments = require( './models/attachments.js' );
+Attachment = media.model.Attachment = require( './models/attachment.js' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- Attachments = media.model.Attachments = require( './models/attachments.js' );
- Attachment = media.model.Attachment = require( './models/attachment.js' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+media.model.Query = require( './models/query.js' );
+media.model.PostImage = require( './models/post-image.js' );
+media.model.Selection = require( './models/selection.js' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- media.model.Query = require( './models/query.js' );
- media.model.PostImage = require( './models/post-image.js' );
- media.model.Selection = require( './models/selection.js' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * ========================================================================
+ * UTILITIES
+ * ========================================================================
+ */
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * A basic equality comparator for Backbone models.
+ *
+ * Used to order models within a collection - @see wp.media.model.Attachments.comparator().
+ *
+ * @param {mixed} a The primary parameter to compare.
+ * @param {mixed} b The primary parameter to compare.
+ * @param {string} ac The fallback parameter to compare, a's cid.
+ * @param {string} bc The fallback parameter to compare, b's cid.
+ * @return {number} -1: a should come before b.
+ * 0: a and b are of the same rank.
+ * 1: b should come before a.
+ */
+media.compare = function( a, b, ac, bc ) {
+ if ( _.isEqual( a, b ) ) {
+ return ac === bc ? 0 : (ac > bc ? -1 : 1);
+ } else {
+ return a > b ? -1 : 1;
+ }
+};
+
+_.extend( media, {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * ========================================================================
- * UTILITIES
- * ========================================================================
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * media.template( id )
+ *
+ * Fetch a JavaScript template for an id, and return a templating function for it.
+ *
+ * See wp.template() in `wp-includes/js/wp-util.js`.
+ *
+ * @borrows wp.template as template
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ template: wp.template,
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * A basic equality comparator for Backbone models.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * media.post( [action], [data] )
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Used to order models within a collection - @see wp.media.model.Attachments.comparator().
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Sends a POST request to WordPress.
+ * See wp.ajax.post() in `wp-includes/js/wp-util.js`.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param {mixed} a The primary parameter to compare.
- * @param {mixed} b The primary parameter to compare.
- * @param {string} ac The fallback parameter to compare, a's cid.
- * @param {string} bc The fallback parameter to compare, b's cid.
- * @return {number} -1: a should come before b.
- * 0: a and b are of the same rank.
- * 1: b should come before a.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @borrows wp.ajax.post as post
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- media.compare = function( a, b, ac, bc ) {
- if ( _.isEqual( a, b ) ) {
- return ac === bc ? 0 : (ac > bc ? -1 : 1);
- } else {
- return a > b ? -1 : 1;
- }
- };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ post: wp.ajax.post,
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _.extend( media, {
- /**
- * media.template( id )
- *
- * Fetch a JavaScript template for an id, and return a templating function for it.
- *
- * See wp.template() in `wp-includes/js/wp-util.js`.
- *
- * @borrows wp.template as template
- */
- template: wp.template,
-
- /**
- * media.post( [action], [data] )
- *
- * Sends a POST request to WordPress.
- * See wp.ajax.post() in `wp-includes/js/wp-util.js`.
- *
- * @borrows wp.ajax.post as post
- */
- post: wp.ajax.post,
-
- /**
- * media.ajax( [action], [options] )
- *
- * Sends an XHR request to WordPress.
- * See wp.ajax.send() in `wp-includes/js/wp-util.js`.
- *
- * @borrows wp.ajax.send as ajax
- */
- ajax: wp.ajax.send,
-
- /**
- * Scales a set of dimensions to fit within bounding dimensions.
- *
- * @param {Object} dimensions
- * @returns {Object}
- */
- fit: function( dimensions ) {
- var width = dimensions.width,
- height = dimensions.height,
- maxWidth = dimensions.maxWidth,
- maxHeight = dimensions.maxHeight,
- constraint;
-
- // Compare ratios between the two values to determine which
- // max to constrain by. If a max value doesn't exist, then the
- // opposite side is the constraint.
- if ( ! _.isUndefined( maxWidth ) && ! _.isUndefined( maxHeight ) ) {
- constraint = ( width / height > maxWidth / maxHeight ) ? 'width' : 'height';
- } else if ( _.isUndefined( maxHeight ) ) {
- constraint = 'width';
- } else if ( _.isUndefined( maxWidth ) && height > maxHeight ) {
- constraint = 'height';
- }
-
- // If the value of the constrained side is larger than the max,
- // then scale the values. Otherwise return the originals; they fit.
- if ( 'width' === constraint && width > maxWidth ) {
- return {
- width : maxWidth,
- height: Math.round( maxWidth * height / width )
- };
- } else if ( 'height' === constraint && height > maxHeight ) {
- return {
- width : Math.round( maxHeight * width / height ),
- height: maxHeight
- };
- } else {
- return {
- width : width,
- height: height
- };
- }
- },
- /**
- * Truncates a string by injecting an ellipsis into the middle.
- * Useful for filenames.
- *
- * @param {String} string
- * @param {Number} [length=30]
- * @param {String} [replacement=…]
- * @returns {String} The string, unless length is greater than string.length.
- */
- truncate: function( string, length, replacement ) {
- length = length || 30;
- replacement = replacement || '…';
-
- if ( string.length <= length ) {
- return string;
- }
-
- return string.substr( 0, length / 2 ) + replacement + string.substr( -1 * length / 2 );
- }
- });
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * ========================================================================
- * MODELS
- * ========================================================================
- */
- /**
- * wp.media.attachment
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * media.ajax( [action], [options] )
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @static
- * @param {String} id A string used to identify a model.
- * @returns {wp.media.model.Attachment}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Sends an XHR request to WordPress.
+ * See wp.ajax.send() in `wp-includes/js/wp-util.js`.
+ *
+ * @borrows wp.ajax.send as ajax
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- media.attachment = function( id ) {
- return Attachment.get( id );
- };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ajax: wp.ajax.send,
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * A collection of all attachments that have been fetched from the server.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Scales a set of dimensions to fit within bounding dimensions.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @static
- * @member {wp.media.model.Attachments}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param {Object} dimensions
+ * @returns {Object}
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- Attachments.all = new Attachments();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ fit: function( dimensions ) {
+ var width = dimensions.width,
+ height = dimensions.height,
+ maxWidth = dimensions.maxWidth,
+ maxHeight = dimensions.maxHeight,
+ constraint;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Compare ratios between the two values to determine which
+ // max to constrain by. If a max value doesn't exist, then the
+ // opposite side is the constraint.
+ if ( ! _.isUndefined( maxWidth ) && ! _.isUndefined( maxHeight ) ) {
+ constraint = ( width / height > maxWidth / maxHeight ) ? 'width' : 'height';
+ } else if ( _.isUndefined( maxHeight ) ) {
+ constraint = 'width';
+ } else if ( _.isUndefined( maxWidth ) && height > maxHeight ) {
+ constraint = 'height';
+ }
+
+ // If the value of the constrained side is larger than the max,
+ // then scale the values. Otherwise return the originals; they fit.
+ if ( 'width' === constraint && width > maxWidth ) {
+ return {
+ width : maxWidth,
+ height: Math.round( maxWidth * height / width )
+ };
+ } else if ( 'height' === constraint && height > maxHeight ) {
+ return {
+ width : Math.round( maxHeight * width / height ),
+ height: maxHeight
+ };
+ } else {
+ return {
+ width : width,
+ height: height
+ };
+ }
+ },
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * wp.media.query
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Truncates a string by injecting an ellipsis into the middle.
+ * Useful for filenames.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Shorthand for creating a new Attachments Query.
- *
- * @param {object} [props]
- * @returns {wp.media.model.Attachments}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param {String} string
+ * @param {Number} [length=30]
+ * @param {String} [replacement=…]
+ * @returns {String} The string, unless length is greater than string.length.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- media.query = function( props ) {
- return new Attachments( null, {
- props: _.extend( _.defaults( props || {}, { orderby: 'date' } ), { query: true } )
- });
- };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ truncate: function( string, length, replacement ) {
+ length = length || 30;
+ replacement = replacement || '…';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Clean up. Prevents mobile browsers caching
- $(window).on('unload', function(){
- window.wp = null;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( string.length <= length ) {
+ return string;
+ }
+
+ return string.substr( 0, length / 2 ) + replacement + string.substr( -1 * length / 2 );
+ }
+});
+
+/**
+ * ========================================================================
+ * MODELS
+ * ========================================================================
+ */
+/**
+ * wp.media.attachment
+ *
+ * @static
+ * @param {String} id A string used to identify a model.
+ * @returns {wp.media.model.Attachment}
+ */
+media.attachment = function( id ) {
+ return Attachment.get( id );
+};
+
+/**
+ * A collection of all attachments that have been fetched from the server.
+ *
+ * @static
+ * @member {wp.media.model.Attachments}
+ */
+Attachments.all = new Attachments();
+
+/**
+ * wp.media.query
+ *
+ * Shorthand for creating a new Attachments Query.
+ *
+ * @param {object} [props]
+ * @returns {wp.media.model.Attachments}
+ */
+media.query = function( props ) {
+ return new Attachments( null, {
+ props: _.extend( _.defaults( props || {}, { orderby: 'date' } ), { query: true } )
</ins><span class="cx" style="display: block; padding: 0 10px"> });
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+};
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}(jQuery));
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Clean up. Prevents mobile browsers caching
+$(window).on('unload', function(){
+ window.wp = null;
+});
</ins></span></pre></div>
<a id="trunksrcwpincludesjsmediaroutersmanagejs"></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/routers/manage.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/routers/manage.js 2015-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/routers/manage.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals jQuery, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * A router for handling the browser history and application state.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,4 +41,4 @@
</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">-module.exports = Router;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Router;
</ins></span></pre></div>
<a id="trunksrcwpincludesjsmediautilsselectionsyncjs"></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/utils/selection-sync.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/utils/selection-sync.js 2015-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/utils/selection-sync.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _ */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.selectionSync
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,4 +61,4 @@
</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">-module.exports = selectionSync;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = selectionSync;
</ins></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsattachmentdetailstwocolumnjs"></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-two-column.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-two-column.js 2015-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/attachment/details-two-column.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * A similar view to media.view.Attachment.Details
</span><span class="cx" style="display: block; padding: 0 10px"> * for use in the Edit Attachment modal.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,9 +32,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp.media.mixin.removeAllPlayers();
</span><span class="cx" style="display: block; padding: 0 10px"> this.$( 'audio, video' ).each( function (i, elem) {
</span><span class="cx" style="display: block; padding: 0 10px"> var el = MediaDetails.prepareSrc( elem );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- new MediaElementPlayer( el, wp.media.mixin.mejsSettings );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ new window.MediaElementPlayer( el, wp.media.mixin.mejsSettings );
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-module.exports = TwoColumn;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = TwoColumn;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/attachment/details.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Attachment.Details
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,7 +57,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> deleteAttachment: function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> event.preventDefault();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( confirm( l10n.warnDelete ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( window.confirm( l10n.warnDelete ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> this.model.destroy();
</span><span class="cx" style="display: block; padding: 0 10px"> // Keep focus inside media modal
</span><span class="cx" style="display: block; padding: 0 10px"> // after image is deleted
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,4 +135,4 @@
</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">-module.exports = Details;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Details;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/attachment/edit-library.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,4 +16,4 @@
</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">-module.exports = EditLibrary;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = EditLibrary;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/attachment/edit-selection.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,4 +17,4 @@
</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">-module.exports = EditSelection;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = EditSelection;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/attachment/library.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,4 +16,4 @@
</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">-module.exports = Library;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Library;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/attachment/selection.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,4 +20,4 @@
</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">-module.exports = Selection;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Selection;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/attachment-compat.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _ */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.AttachmentCompat
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,4 +80,4 @@
</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">-module.exports = AttachmentCompat;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = AttachmentCompat;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/attachment-filters/all.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.AttachmentFilters.All
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,4 +86,4 @@
</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">-module.exports = All;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = All;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/attachment-filters/date.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * A filter dropdown for month/dates.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,4 +37,4 @@
</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">-module.exports = DateFilter;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = DateFilter;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/attachment-filters/uploaded.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.AttachmentFilters.Uploaded
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,4 +55,4 @@
</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">-module.exports = Uploaded;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Uploaded;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/attachment-filters.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.AttachmentFilters
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,4 +73,4 @@
</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">-module.exports = AttachmentFilters;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = AttachmentFilters;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/attachment.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Attachment
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -551,4 +549,4 @@
</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">-module.exports = Attachment;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Attachment;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/attachments/browser.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.AttachmentsBrowser
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,13 +188,13 @@
</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">- if ( ! mediaTrash && ! confirm( l10n.warnBulkDelete ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! mediaTrash && ! window.confirm( l10n.warnBulkDelete ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( mediaTrash &&
</span><span class="cx" style="display: block; padding: 0 10px"> 'trash' !== selection.at( 0 ).get( 'status' ) &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ! confirm( l10n.warnBulkTrash ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ! window.confirm( l10n.warnBulkTrash ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</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">@@ -244,7 +242,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> click: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var removed = [], selection = this.controller.state().get( '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">- if ( ! selection.length || ! confirm( l10n.warnBulkDelete ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! selection.length || ! window.confirm( l10n.warnBulkDelete ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -456,4 +454,4 @@
</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">-module.exports = AttachmentsBrowser;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = AttachmentsBrowser;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/attachments/selection.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _ */
-
</del><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="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,4 +26,4 @@
</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">-module.exports = Selection;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Selection;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/attachments.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Attachments
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,7 +270,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The scroll event occurs on the document, but the element
</span><span class="cx" style="display: block; padding: 0 10px"> // that should be checked is the document body.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( el == document ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( el === document ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> el = document.body;
</span><span class="cx" style="display: block; padding: 0 10px"> scrollTop = $(document).scrollTop();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -297,4 +295,4 @@
</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">-module.exports = Attachments;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Attachments;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/audio-details.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.AudioDetails
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,4 +33,4 @@
</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">-module.exports = AudioDetails;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = AudioDetails;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/button/delete-selected-permanently.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,4 +40,4 @@
</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">-module.exports = DeleteSelectedPermanently;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = DeleteSelectedPermanently;
</ins></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsbuttondeleteselectedjs"></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.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.js 2015-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/button/delete-selected.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * A button that handles bulk Delete/Trash logic
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,4 +46,4 @@
</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">-module.exports = DeleteSelected;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = DeleteSelected;
</ins></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsbuttonselectmodetogglejs"></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/select-mode-toggle.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/select-mode-toggle.js 2015-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/button/select-mode-toggle.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> var Button = require( '../button.js' ),
</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"> SelectModeToggle;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,4 +50,4 @@
</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">-module.exports = SelectModeToggle;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = SelectModeToggle;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/button-group.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.ButtonGroup
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,4 +43,4 @@
</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">-module.exports = ButtonGroup;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = ButtonGroup;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/button.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Button
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,4 +84,4 @@
</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">-module.exports = Button;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Button;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/cropper.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Cropper
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,9 +58,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.views.add( '.upload-errors', new UploaderStatusError({
</span><span class="cx" style="display: block; padding: 0 10px"> filename: UploaderStatus.prototype.filename(filename),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- message: _wpMediaViewsL10n.cropError
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ message: window._wpMediaViewsL10n.cropError
</ins><span class="cx" style="display: block; padding: 0 10px"> }), { at: 0 });
</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">-module.exports = Cropper;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Cropper;
</ins></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewseditimagedetailsjs"></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-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/edit-image-details.js 2015-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/edit-image-details.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,4 +21,4 @@
</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">-module.exports = Details;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Details;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/edit-image.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> var View = require( './view.js' ),
</span><span class="cx" style="display: block; padding: 0 10px"> EditImage;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,4 +48,4 @@
</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">-module.exports = EditImage;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = EditImage;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/embed/image.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.EmbedImage
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,4 +28,4 @@
</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">-module.exports = EmbedImage;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = EmbedImage;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/embed/link.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.EmbedLink
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,4 +62,4 @@
</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">-module.exports = EmbedLink;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = EmbedLink;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/embed/url.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.EmbedUrl
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,4 +74,4 @@
</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">-module.exports = EmbedUrl;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = EmbedUrl;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/embed.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,4 +65,4 @@
</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">-module.exports = Embed;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Embed;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/focus-manager.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,4 +44,4 @@
</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">-module.exports = FocusManager;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = FocusManager;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/frame/audio-details.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.MediaFrame.AudioDetails
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,4 +72,4 @@
</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">-module.exports = AudioDetails;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = AudioDetails;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/frame/edit-attachments.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * A frame for editing the details of a specific media item.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,4 +241,4 @@
</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">-module.exports = EditAttachments;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = EditAttachments;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/frame/image-details.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.MediaFrame.ImageDetails
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,4 +178,4 @@
</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">-module.exports = ImageDetails;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = ImageDetails;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/frame/manage.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.MediaFrame.Manage
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -237,11 +235,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Verify pushState support and activate
</span><span class="cx" style="display: block; padding: 0 10px"> if ( window.history && window.history.pushState ) {
</span><span class="cx" style="display: block; padding: 0 10px"> Backbone.history.start( {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- root: _wpMediaGridSettings.adminUrl,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ root: window._wpMediaGridSettings.adminUrl,
</ins><span class="cx" style="display: block; padding: 0 10px"> pushState: true
</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"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-module.exports = Manage;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Manage;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/frame/media-details.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.MediaFrame.MediaDetails
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,4 +127,4 @@
</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">-module.exports = MediaDetails;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = MediaDetails;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/frame/post.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.MediaFrame.Post
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -748,4 +746,4 @@
</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">-module.exports = Post;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Post;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/frame/select.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.MediaFrame.Select
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,4 +169,4 @@
</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">-module.exports = Select;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Select;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/frame/video-details.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.MediaFrame.VideoDetails
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,4 +132,4 @@
</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">-module.exports = VideoDetails;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = VideoDetails;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/frame.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Frame
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,4 +167,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Make the `Frame` a `StateMachine`.
</span><span class="cx" style="display: block; padding: 0 10px"> _.extend( Frame.prototype, StateMachine.prototype );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-module.exports = Frame;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Frame;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/iframe.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,4 +22,4 @@
</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">-module.exports = Iframe;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Iframe;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/image-details.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.ImageDetails
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +71,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> postRender: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> setTimeout( _.bind( this.resetFocus, this ), 10 );
</span><span class="cx" style="display: block; padding: 0 10px"> this.toggleLinkSettings();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( getUserSetting( 'advImgDetails' ) === 'show' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( window.getUserSetting( 'advImgDetails' ) === 'show' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> this.toggleAdvanced( true );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> this.trigger( 'post-render' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +144,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> mode = 'show';
</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">- setUserSetting( 'advImgDetails', mode );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ window.setUserSetting( 'advImgDetails', mode );
</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"> editAttachment: function( event ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,4 +163,4 @@
</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">-module.exports = AttachmentDisplay;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = AttachmentDisplay;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/label.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,4 +22,4 @@
</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">-module.exports = Label;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Label;
</ins></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsmediadetailsjs"></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-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/media-details.js 2015-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/media-details.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.MediaDetails
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,7 +81,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> setPlayer : function() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! this.players.length && this.media ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.players.push( new MediaElementPlayer( this.media, this.settings ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.players.push( new window.MediaElementPlayer( this.media, this.settings ) );
</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">@@ -111,7 +109,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> render: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> AttachmentDisplay.prototype.render.apply( this, arguments );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> setTimeout( _.bind( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> this.resetFocus();
</span><span class="cx" style="display: block; padding: 0 10px"> }, this ), 10 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,4 +147,4 @@
</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">-module.exports = MediaDetails;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = MediaDetails;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/media-frame.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.MediaFrame
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -251,4 +249,4 @@
</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">-module.exports = MediaFrame;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = MediaFrame;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/menu-item.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.MenuItem
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,4 +68,4 @@
</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">-module.exports = MenuItem;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = MenuItem;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/menu.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,4 +112,4 @@
</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">-module.exports = Menu;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Menu;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/modal.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Modal
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -212,4 +210,4 @@
</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">-module.exports = Modal;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Modal;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/priority-list.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.PriorityList
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,4 +95,4 @@
</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">-module.exports = PriorityList;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = PriorityList;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/router-item.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,4 +22,4 @@
</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">-module.exports = RouterItem;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = RouterItem;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/router.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,4 +33,4 @@
</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">-module.exports = Router;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Router;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/search.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Search
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,4 +44,4 @@
</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">-module.exports = Search;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Search;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/selection.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Selection
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,4 +80,4 @@
</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">-module.exports = Selection;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Selection;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/settings/attachment-display.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Settings.AttachmentDisplay
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,4 +89,4 @@
</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">-module.exports = AttachmentDisplay;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = AttachmentDisplay;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/settings/gallery.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Settings.Gallery
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,4 +15,4 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-module.exports = Gallery;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Gallery;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/settings/playlist.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Settings.Playlist
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,4 +15,4 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-module.exports = Playlist;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Playlist;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/settings.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Settings
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +105,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If the setting has a corresponding user setting,
</span><span class="cx" style="display: block; padding: 0 10px"> // update that as well.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( userSetting = $setting.data('userSetting') ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- setUserSetting( userSetting, value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ window.setUserSetting( userSetting, value );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,4 +116,4 @@
</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">-module.exports = Settings;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Settings;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/sidebar.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,4 +14,4 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-module.exports = Sidebar;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Sidebar;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/spinner.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Spinner
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,4 +33,4 @@
</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">-module.exports = Spinner;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Spinner;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/toolbar/embed.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Toolbar.Embed
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,4 +32,4 @@
</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">-module.exports = Embed;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Embed;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/toolbar/select.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Toolbar.Select
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,4 +65,4 @@
</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">-module.exports = Select;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Select;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/toolbar.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals Backbone, _ */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Toolbar
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,4 +157,4 @@
</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">-module.exports = Toolbar;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = Toolbar;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/uploader/editor.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Creates a dropzone on WP editor instances (elements with .wp-editor-wrap
</span><span class="cx" style="display: block; padding: 0 10px"> * or #wp-fullscreen-body) and relays drag'n'dropped files to a media workflow.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -216,4 +214,4 @@
</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">-module.exports = EditorUploader;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = EditorUploader;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/uploader/inline.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.UploaderInline
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,4 +127,4 @@
</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">-module.exports = UploaderInline;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = UploaderInline;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/uploader/status-error.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.UploaderStatusError
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,4 +14,4 @@
</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 class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-module.exports = UploaderStatusError;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = UploaderStatusError;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/uploader/status.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.UploaderStatus
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,4 +134,4 @@
</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">-module.exports = UploaderStatus;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = UploaderStatus;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/uploader/window.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.UploaderWindow
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,4 +107,4 @@
</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">-module.exports = UploaderWindow;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = UploaderWindow;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/video-details.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.VideoDetails
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,4 +38,4 @@
</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">-module.exports = VideoDetails;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = VideoDetails;
</ins></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsviewjs"></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/view.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/view.js 2015-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views/view.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,3 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.View
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,4 +61,4 @@
</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">-module.exports = View;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+module.exports = View;
</ins></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-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.CollectionAdd
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,9 +98,8 @@
</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 = CollectionAdd;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./library.js":10}],2:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp, jQuery, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.CollectionEdit
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,9 +260,8 @@
</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 = CollectionEdit;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../views/attachment/edit-library.js":25,"../views/view.js":71,"./library.js":10}],3:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.Cropper
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -341,7 +337,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.$el.text(l10n.cropping);
</span><span class="cx" style="display: block; padding: 0 10px"> this.$el.attr('disabled', true);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> controller.state().doCrop( selection ).done( function( croppedImage ) {
</span><span class="cx" style="display: block; padding: 0 10px"> controller.trigger('cropped', croppedImage );
</span><span class="cx" style="display: block; padding: 0 10px"> controller.close();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -383,9 +379,8 @@
</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 = Cropper;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../views/cropper.js":34,"../views/toolbar.js":63,"./state.js":15}],4:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.EditImage
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -462,9 +457,8 @@
</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 = EditImage;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../views/toolbar.js":63,"./state.js":15}],5:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.Embed
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -600,9 +594,8 @@
</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 = Embed;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./state.js":15}],6:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.FeaturedImage
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -723,9 +716,8 @@
</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 = FeaturedImage;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./library.js":10}],7:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * A state for selecting more images to add to a gallery.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -777,8 +769,9 @@
</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"> // If a library wasn't supplied, create a library of images.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! this.get('library') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! this.get('library') ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> this.set( 'library', wp.media.query({ type: 'image' }) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><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">@@ -790,8 +783,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var library = this.get('library'),
</span><span class="cx" style="display: block; padding: 0 10px"> edit = this.frame.state('gallery-edit').get('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">- if ( this.editLibrary && this.editLibrary !== edit )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( this.editLibrary && this.editLibrary !== edit ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> library.unobserve( this.editLibrary );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Accepts attachments that exist in the original library and
</span><span class="cx" style="display: block; padding: 0 10px"> // that do not exist in gallery's library.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -811,9 +805,8 @@
</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 = GalleryAdd;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./library.js":10}],8:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.GalleryEdit
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -875,12 +868,15 @@
</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"> // If we haven't been provided a `library`, create a `Selection`.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! this.get('library') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! this.get('library') ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> this.set( 'library', new wp.media.model.Selection() );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><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">- if ( ! this.get('AttachmentView') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! this.get('AttachmentView') ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> this.set( 'AttachmentView', EditLibraryView );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+
</ins><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="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -951,9 +947,8 @@
</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 = GalleryEdit;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../views/attachment/edit-library.js":25,"../views/settings/gallery.js":59,"./library.js":10}],9:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.ImageDetails
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1014,9 +1009,8 @@
</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 = ImageDetails;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./library.js":10,"./state.js":15}],10:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, Backbone, getUserSetting, setUserSetting */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.Library
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1054,6 +1048,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var selectionSync = require( '../utils/selection-sync.js' ),
</span><span class="cx" style="display: block; padding: 0 10px"> State = require( './state.js' ),
</span><span class="cx" style="display: block; padding: 0 10px"> l10n = wp.media.view.l10n,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ getUserSetting = window.getUserSetting,
+ setUserSetting = window.setUserSetting,
</ins><span class="cx" style="display: block; padding: 0 10px"> Library;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> Library = State.extend({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1088,7 +1084,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.set( 'library', wp.media.query() );
</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">- if ( ! (selection instanceof Selection) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( selection instanceof wp.media.model.Selection ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> props = selection;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! props ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1287,9 +1283,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _.extend( Library.prototype, selectionSync );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Library;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../utils/selection-sync.js":16,"./state.js":15}],11:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.MediaLibrary
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1338,9 +1333,8 @@
</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 = MediaLibrary;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./library.js":10}],12:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.Region
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1518,9 +1512,8 @@
</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 = Region;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{}],13:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.ReplaceImage
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1627,9 +1620,8 @@
</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 = ReplaceImage;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./library.js":10}],14:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.StateMachine
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1752,9 +1744,8 @@
</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 = StateMachine;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{}],15:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.controller.State
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1994,9 +1985,8 @@
</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 = State;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{}],16:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _ */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.selectionSync
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2061,158 +2051,155 @@
</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 = selectionSync;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{}],17:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/* global _wpMediaViewsL10n, confirm, getUserSetting, setUserSetting */
-( function( $, _ ) {
- var l10n,
- media = wp.media;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var media = wp.media,
+ $ = jQuery,
+ l10n;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- media.isTouchDevice = ( 'ontouchend' in document );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+media.isTouchDevice = ( 'ontouchend' in document );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Link any localized strings.
- l10n = media.view.l10n = typeof _wpMediaViewsL10n === 'undefined' ? {} : _wpMediaViewsL10n;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Link any localized strings.
+l10n = media.view.l10n = window._wpMediaViewsL10n || {};
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Link any settings.
- media.view.settings = l10n.settings || {};
- delete l10n.settings;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Link any settings.
+media.view.settings = l10n.settings || {};
+delete l10n.settings;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Copy the `post` setting over to the model settings.
- media.model.settings.post = media.view.settings.post;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Copy the `post` setting over to the model settings.
+media.model.settings.post = media.view.settings.post;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Check if the browser supports CSS 3.0 transitions
- $.support.transition = (function(){
- var style = document.documentElement.style,
- transitions = {
- WebkitTransition: 'webkitTransitionEnd',
- MozTransition: 'transitionend',
- OTransition: 'oTransitionEnd otransitionend',
- transition: 'transitionend'
- }, transition;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Check if the browser supports CSS 3.0 transitions
+$.support.transition = (function(){
+ var style = document.documentElement.style,
+ transitions = {
+ WebkitTransition: 'webkitTransitionEnd',
+ MozTransition: 'transitionend',
+ OTransition: 'oTransitionEnd otransitionend',
+ transition: 'transitionend'
+ }, transition;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- transition = _.find( _.keys( transitions ), function( transition ) {
- return ! _.isUndefined( style[ transition ] );
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ transition = _.find( _.keys( transitions ), function( transition ) {
+ return ! _.isUndefined( style[ transition ] );
+ });
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return transition && {
- end: transitions[ transition ]
- };
- }());
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return transition && {
+ end: transitions[ transition ]
+ };
+}());
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * A shared event bus used to provide events into
- * the media workflows that 3rd-party devs can use to hook
- * in.
- */
- media.events = _.extend( {}, Backbone.Events );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * A shared event bus used to provide events into
+ * the media workflows that 3rd-party devs can use to hook
+ * in.
+ */
+media.events = _.extend( {}, Backbone.Events );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Makes it easier to bind events using transitions.
- *
- * @param {string} selector
- * @param {Number} sensitivity
- * @returns {Promise}
- */
- media.transition = function( selector, sensitivity ) {
- var deferred = $.Deferred();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Makes it easier to bind events using transitions.
+ *
+ * @param {string} selector
+ * @param {Number} sensitivity
+ * @returns {Promise}
+ */
+media.transition = function( selector, sensitivity ) {
+ var deferred = $.Deferred();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sensitivity = sensitivity || 2000;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sensitivity = sensitivity || 2000;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $.support.transition ) {
- if ( ! (selector instanceof $) ) {
- selector = $( selector );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $.support.transition ) {
+ if ( ! (selector instanceof $) ) {
+ selector = $( selector );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Resolve the deferred when the first element finishes animating.
- selector.first().one( $.support.transition.end, deferred.resolve );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Resolve the deferred when the first element finishes animating.
+ selector.first().one( $.support.transition.end, deferred.resolve );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Just in case the event doesn't trigger, fire a callback.
- _.delay( deferred.resolve, sensitivity );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Just in case the event doesn't trigger, fire a callback.
+ _.delay( deferred.resolve, sensitivity );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Otherwise, execute on the spot.
- } else {
- deferred.resolve();
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Otherwise, execute on the spot.
+ } else {
+ deferred.resolve();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return deferred.promise();
- };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return deferred.promise();
+};
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- media.controller.Region = require( './controllers/region.js' );
- media.controller.StateMachine = require( './controllers/state-machine.js' );
- media.controller.State = require( './controllers/state.js' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+media.controller.Region = require( './controllers/region.js' );
+media.controller.StateMachine = require( './controllers/state-machine.js' );
+media.controller.State = require( './controllers/state.js' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- media.selectionSync = require( './utils/selection-sync.js' );
- media.controller.Library = require( './controllers/library.js' );
- media.controller.ImageDetails = require( './controllers/image-details.js' );
- media.controller.GalleryEdit = require( './controllers/gallery-edit.js' );
- media.controller.GalleryAdd = require( './controllers/gallery-add.js' );
- media.controller.CollectionEdit = require( './controllers/collection-edit.js' );
- media.controller.CollectionAdd = require( './controllers/collection-add.js' );
- media.controller.FeaturedImage = require( './controllers/featured-image.js' );
- media.controller.ReplaceImage = require( './controllers/replace-image.js' );
- media.controller.EditImage = require( './controllers/edit-image.js' );
- media.controller.MediaLibrary = require( './controllers/media-library.js' );
- media.controller.Embed = require( './controllers/embed.js' );
- media.controller.Cropper = require( './controllers/cropper.js' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+media.selectionSync = require( './utils/selection-sync.js' );
+media.controller.Library = require( './controllers/library.js' );
+media.controller.ImageDetails = require( './controllers/image-details.js' );
+media.controller.GalleryEdit = require( './controllers/gallery-edit.js' );
+media.controller.GalleryAdd = require( './controllers/gallery-add.js' );
+media.controller.CollectionEdit = require( './controllers/collection-edit.js' );
+media.controller.CollectionAdd = require( './controllers/collection-add.js' );
+media.controller.FeaturedImage = require( './controllers/featured-image.js' );
+media.controller.ReplaceImage = require( './controllers/replace-image.js' );
+media.controller.EditImage = require( './controllers/edit-image.js' );
+media.controller.MediaLibrary = require( './controllers/media-library.js' );
+media.controller.Embed = require( './controllers/embed.js' );
+media.controller.Cropper = require( './controllers/cropper.js' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- media.View = require( './views/view.js' );
- media.view.Frame = require( './views/view.js' );
- media.view.MediaFrame = require( './views/media-frame.js' );
- media.view.MediaFrame.Select = require( './views/frame/select.js' );
- media.view.MediaFrame.Post = require( './views/frame/post.js' );
- media.view.MediaFrame.ImageDetails = require( './views/frame/image-details.js' );
- media.view.Modal = require( './views/modal.js' );
- media.view.FocusManager = require( './views/focus-manager.js' );
- media.view.UploaderWindow = require( './views/uploader/window.js' );
- media.view.EditorUploader = require( './views/uploader/editor.js' );
- media.view.UploaderInline = require( './views/uploader/inline.js' );
- media.view.UploaderStatus = require( './views/uploader/status.js' );
- media.view.UploaderStatusError = require( './views/uploader/status-error.js' );
- media.view.Toolbar = require( './views/toolbar.js' );
- media.view.Toolbar.Select = require( './views/toolbar/select.js' );
- media.view.Toolbar.Embed = require( './views/toolbar/embed.js' );
- media.view.Button = require( './views/button.js' );
- media.view.ButtonGroup = require( './views/button-group.js' );
- media.view.PriorityList = require( './views/priority-list.js' );
- media.view.MenuItem = require( './views/menu-item.js' );
- media.view.Menu = require( './views/menu.js' );
- media.view.RouterItem = require( './views/router-item.js' );
- media.view.Router = require( './views/router.js' );
- media.view.Sidebar = require( './views/sidebar.js' );
- media.view.Attachment = require( './views/attachment.js' );
- media.view.Attachment.Library = require( './views/attachment/library.js' );
- media.view.Attachment.EditLibrary = require( './views/attachment/edit-library.js' );
- media.view.Attachments = require( './views/attachments.js' );
- media.view.Search = require( './views/search.js' );
- media.view.AttachmentFilters = require( './views/attachment-filters.js' );
- media.view.DateFilter = require( './views/attachment-filters/date.js' );
- media.view.AttachmentFilters.Uploaded = require( './views/attachment-filters/uploaded.js' );
- media.view.AttachmentFilters.All = require( './views/attachment-filters/all.js' );
- media.view.AttachmentsBrowser = require( './views/attachments/browser.js' );
- media.view.Selection = require( './views/selection.js' );
- media.view.Attachment.Selection = require( './views/attachment/selection.js' );
- media.view.Attachments.Selection = require( './views/attachments/selection.js' );
- media.view.Attachment.EditSelection = require( './views/attachment/edit-selection.js' );
- media.view.Settings = require( './views/settings.js' );
- media.view.Settings.AttachmentDisplay = require( './views/settings/attachment-display.js' );
- media.view.Settings.Gallery = require( './views/settings/gallery.js' );
- media.view.Settings.Playlist = require( './views/settings/playlist.js' );
- media.view.Attachment.Details = require( './views/attachment/details.js' );
- media.view.AttachmentCompat = require( './views/attachment-compat.js' );
- media.view.Iframe = require( './views/iframe.js' );
- media.view.Embed = require( './views/embed.js' );
- media.view.Label = require( './views/label.js' );
- media.view.EmbedUrl = require( './views/embed/url.js' );
- media.view.EmbedLink = require( './views/embed/link.js' );
- media.view.EmbedImage = require( './views/embed/image.js' );
- media.view.ImageDetails = require( './views/image-details.js' );
- media.view.Cropper = require( './views/cropper.js' );
- media.view.EditImage = require( './views/edit-image.js' );
- media.view.Spinner = require( './views/spinner.js' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+media.View = require( './views/view.js' );
+media.view.Frame = require( './views/view.js' );
+media.view.MediaFrame = require( './views/media-frame.js' );
+media.view.MediaFrame.Select = require( './views/frame/select.js' );
+media.view.MediaFrame.Post = require( './views/frame/post.js' );
+media.view.MediaFrame.ImageDetails = require( './views/frame/image-details.js' );
+media.view.Modal = require( './views/modal.js' );
+media.view.FocusManager = require( './views/focus-manager.js' );
+media.view.UploaderWindow = require( './views/uploader/window.js' );
+media.view.EditorUploader = require( './views/uploader/editor.js' );
+media.view.UploaderInline = require( './views/uploader/inline.js' );
+media.view.UploaderStatus = require( './views/uploader/status.js' );
+media.view.UploaderStatusError = require( './views/uploader/status-error.js' );
+media.view.Toolbar = require( './views/toolbar.js' );
+media.view.Toolbar.Select = require( './views/toolbar/select.js' );
+media.view.Toolbar.Embed = require( './views/toolbar/embed.js' );
+media.view.Button = require( './views/button.js' );
+media.view.ButtonGroup = require( './views/button-group.js' );
+media.view.PriorityList = require( './views/priority-list.js' );
+media.view.MenuItem = require( './views/menu-item.js' );
+media.view.Menu = require( './views/menu.js' );
+media.view.RouterItem = require( './views/router-item.js' );
+media.view.Router = require( './views/router.js' );
+media.view.Sidebar = require( './views/sidebar.js' );
+media.view.Attachment = require( './views/attachment.js' );
+media.view.Attachment.Library = require( './views/attachment/library.js' );
+media.view.Attachment.EditLibrary = require( './views/attachment/edit-library.js' );
+media.view.Attachments = require( './views/attachments.js' );
+media.view.Search = require( './views/search.js' );
+media.view.AttachmentFilters = require( './views/attachment-filters.js' );
+media.view.DateFilter = require( './views/attachment-filters/date.js' );
+media.view.AttachmentFilters.Uploaded = require( './views/attachment-filters/uploaded.js' );
+media.view.AttachmentFilters.All = require( './views/attachment-filters/all.js' );
+media.view.AttachmentsBrowser = require( './views/attachments/browser.js' );
+media.view.Selection = require( './views/selection.js' );
+media.view.Attachment.Selection = require( './views/attachment/selection.js' );
+media.view.Attachments.Selection = require( './views/attachments/selection.js' );
+media.view.Attachment.EditSelection = require( './views/attachment/edit-selection.js' );
+media.view.Settings = require( './views/settings.js' );
+media.view.Settings.AttachmentDisplay = require( './views/settings/attachment-display.js' );
+media.view.Settings.Gallery = require( './views/settings/gallery.js' );
+media.view.Settings.Playlist = require( './views/settings/playlist.js' );
+media.view.Attachment.Details = require( './views/attachment/details.js' );
+media.view.AttachmentCompat = require( './views/attachment-compat.js' );
+media.view.Iframe = require( './views/iframe.js' );
+media.view.Embed = require( './views/embed.js' );
+media.view.Label = require( './views/label.js' );
+media.view.EmbedUrl = require( './views/embed/url.js' );
+media.view.EmbedLink = require( './views/embed/link.js' );
+media.view.EmbedImage = require( './views/embed/image.js' );
+media.view.ImageDetails = require( './views/image-details.js' );
+media.view.Cropper = require( './views/cropper.js' );
+media.view.EditImage = require( './views/edit-image.js' );
+media.view.Spinner = require( './views/spinner.js' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}(jQuery, _));
</del><span class="cx" style="display: block; padding: 0 10px"> },{"./controllers/collection-add.js":1,"./controllers/collection-edit.js":2,"./controllers/cropper.js":3,"./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/image-details.js":9,"./controllers/library.js":10,"./controllers/media-library.js":11,"./controllers/region.js":12,"./controllers/replace-image.js":13,"./controllers/state-machine.js":14,"./controllers/state.js":15,"./utils/selection-sync.js":16,"./views/attachment-compat.js":18,"./views/attachment-filters.js":19,"./views/attachment-filters/all.js":20,"./views/attachment-filters/date.js":21,"./views/attachment-filters/uploaded.js":22,&quo
t;./views/attachment.js":23,"./views/attachment/details.js":24,"./views/attachment/edit-library.js":25,"./views/attachment/edit-selection.js":26,"./views/attachment/library.js":27,"./views/attachment/selection.js":28,"./views/attachments.js":29,"./views/attachments/browser.js":30,"./views/attachments/selection.js":31,"./views/button-group.js":32,"./views/button.js":33,"./views/cropper.js":34,"./views/edit-image.js":35,"./views/embed.js":36,"./views/embed/image.js":37,"./views/embed/link.js":38,"./views/embed/url.js":39,"./views/focus-manager.js":40,"./views/frame/image-details.js":42,"./views/frame/post.js":43,"./views/frame/select.js":44,"./views/iframe.js":45,"./views/image-details.js":46,"./views/label.js":47,"./views/media-frame.js":48,&q
uot;./views/menu-item.js":49,"./views/menu.js":50,"./views/modal.js":51,"./views/priority-list.js":52,"./views/router-item.js":53,"./views/router.js":54,"./views/search.js":55,"./views/selection.js":56,"./views/settings.js":57,"./views/settings/attachment-display.js":58,"./views/settings/gallery.js":59,"./views/settings/playlist.js":60,"./views/sidebar.js":61,"./views/spinner.js":62,"./views/toolbar.js":63,"./views/toolbar/embed.js":64,"./views/toolbar/select.js":65,"./views/uploader/editor.js":66,"./views/uploader/inline.js":67,"./views/uploader/status-error.js":68,"./views/uploader/status.js":69,"./views/uploader/window.js":70,"./views/view.js":71}],18:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _ */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.AttachmentCompat
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2296,9 +2283,8 @@
</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 = AttachmentCompat;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":71}],19:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.AttachmentFilters
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2375,9 +2361,8 @@
</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 = AttachmentFilters;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":71}],20:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.AttachmentFilters.All
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2467,9 +2452,8 @@
</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 = All;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../attachment-filters.js":19}],21:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * A filter dropdown for month/dates.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2510,9 +2494,8 @@
</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 = DateFilter;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../attachment-filters.js":19}],22:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.AttachmentFilters.Uploaded
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2571,9 +2554,8 @@
</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 = Uploaded;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../attachment-filters.js":19}],23:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Attachment
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3126,9 +3108,8 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":71}],24:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Attachment.Details
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3188,7 +3169,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> deleteAttachment: function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> event.preventDefault();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( confirm( l10n.warnDelete ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( window.confirm( l10n.warnDelete ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> this.model.destroy();
</span><span class="cx" style="display: block; padding: 0 10px"> // Keep focus inside media modal
</span><span class="cx" style="display: block; padding: 0 10px"> // after image is deleted
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3267,6 +3248,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"> module.exports = Details;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../attachment.js":23}],25:[function(require,module,exports){
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -3287,6 +3269,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"> module.exports = EditLibrary;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../attachment.js":23}],26:[function(require,module,exports){
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -3308,6 +3291,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"> module.exports = EditSelection;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./selection.js":28}],27:[function(require,module,exports){
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -3328,6 +3312,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"> module.exports = Library;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../attachment.js":23}],28:[function(require,module,exports){
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -3352,9 +3337,8 @@
</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 = Selection;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../attachment.js":23}],29:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Attachments
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3627,7 +3611,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The scroll event occurs on the document, but the element
</span><span class="cx" style="display: block; padding: 0 10px"> // that should be checked is the document body.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( el == document ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( el === document ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> el = document.body;
</span><span class="cx" style="display: block; padding: 0 10px"> scrollTop = $(document).scrollTop();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3653,9 +3637,8 @@
</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 = Attachments;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./attachment.js":23,"./view.js":71}],30:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.AttachmentsBrowser
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3846,13 +3829,13 @@
</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">- if ( ! mediaTrash && ! confirm( l10n.warnBulkDelete ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! mediaTrash && ! window.confirm( l10n.warnBulkDelete ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( mediaTrash &&
</span><span class="cx" style="display: block; padding: 0 10px"> 'trash' !== selection.at( 0 ).get( 'status' ) &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ! confirm( l10n.warnBulkTrash ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ! window.confirm( l10n.warnBulkTrash ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</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">@@ -3900,7 +3883,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> click: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var removed = [], selection = this.controller.state().get( '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">- if ( ! selection.length || ! confirm( l10n.warnBulkDelete ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! selection.length || ! window.confirm( l10n.warnBulkDelete ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4113,9 +4096,8 @@
</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 = AttachmentsBrowser;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="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){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _ */
-
</del><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="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4145,9 +4127,8 @@
</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 = Selection;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../attachment/selection.js":28,"../attachments.js":29}],32:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.ButtonGroup
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4194,9 +4175,8 @@
</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 = ButtonGroup;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./button.js":33,"./view.js":71}],33:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Button
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4284,9 +4264,8 @@
</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 = Button;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":71}],34:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Cropper
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4347,15 +4326,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.views.add( '.upload-errors', new UploaderStatusError({
</span><span class="cx" style="display: block; padding: 0 10px"> filename: UploaderStatus.prototype.filename(filename),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- message: _wpMediaViewsL10n.cropError
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ message: window._wpMediaViewsL10n.cropError
</ins><span class="cx" style="display: block; padding: 0 10px"> }), { at: 0 });
</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 = Cropper;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./uploader/status-error.js":68,"./uploader/status.js":69,"./view.js":71}],35:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> var View = require( './view.js' ),
</span><span class="cx" style="display: block; padding: 0 10px"> EditImage;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4407,6 +4385,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"> module.exports = EditImage;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":71}],36:[function(require,module,exports){
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -4476,9 +4455,8 @@
</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 = Embed;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="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){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.EmbedImage
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4510,9 +4488,8 @@
</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 = EmbedImage;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../settings/attachment-display.js":58}],38:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.EmbedLink
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4578,9 +4555,8 @@
</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 = EmbedLink;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../settings.js":57}],39:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.EmbedUrl
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4658,6 +4634,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"> module.exports = EmbedUrl;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../view.js":71}],40:[function(require,module,exports){
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -4706,9 +4683,8 @@
</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 = FocusManager;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":71}],41:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Frame
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4879,9 +4855,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _.extend( Frame.prototype, StateMachine.prototype );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> module.exports = Frame;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="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){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.MediaFrame.ImageDetails
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5063,9 +5038,8 @@
</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 = ImageDetails;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="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){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.MediaFrame.Post
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5815,9 +5789,8 @@
</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 = Post;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="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){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.MediaFrame.Select
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5990,6 +5963,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"> module.exports = Select;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="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){
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -6016,9 +5990,8 @@
</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 = Iframe;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":71}],46:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.ImageDetails
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6092,7 +6065,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> postRender: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> setTimeout( _.bind( this.resetFocus, this ), 10 );
</span><span class="cx" style="display: block; padding: 0 10px"> this.toggleLinkSettings();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( getUserSetting( 'advImgDetails' ) === 'show' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( window.getUserSetting( 'advImgDetails' ) === 'show' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> this.toggleAdvanced( true );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> this.trigger( 'post-render' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6165,7 +6138,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> mode = 'show';
</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">- setUserSetting( 'advImgDetails', mode );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ window.setUserSetting( 'advImgDetails', mode );
</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"> editAttachment: function( event ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6185,6 +6158,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"> module.exports = AttachmentDisplay;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./settings/attachment-display.js":58}],47:[function(require,module,exports){
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @class
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6211,9 +6185,8 @@
</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 = Label;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":71}],48:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.MediaFrame
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6466,9 +6439,8 @@
</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 = MediaFrame;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="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){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.MenuItem
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6540,6 +6512,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"> module.exports = MenuItem;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":71}],50:[function(require,module,exports){
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -6656,9 +6629,8 @@
</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 = Menu;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./menu-item.js":49,"./priority-list.js":52}],51:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Modal
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6872,9 +6844,8 @@
</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 = Modal;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./focus-manager.js":40,"./view.js":71}],52:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.PriorityList
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6973,6 +6944,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"> module.exports = PriorityList;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":71}],53:[function(require,module,exports){
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -6999,6 +6971,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"> module.exports = RouterItem;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./menu-item.js":49}],54:[function(require,module,exports){
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -7036,9 +7009,8 @@
</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 = Router;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./menu.js":50,"./router-item.js":53}],55:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Search
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7086,9 +7058,8 @@
</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 = Search;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":71}],56:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Selection
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7172,9 +7143,8 @@
</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 = Selection;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./attachments/selection.js":31,"./view.js":71}],57:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, Backbone, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Settings
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7282,7 +7252,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If the setting has a corresponding user setting,
</span><span class="cx" style="display: block; padding: 0 10px"> // update that as well.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( userSetting = $setting.data('userSetting') ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- setUserSetting( userSetting, value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ window.setUserSetting( userSetting, value );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7294,9 +7264,8 @@
</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 = Settings;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":71}],58:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Settings.AttachmentDisplay
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7389,9 +7358,8 @@
</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 = AttachmentDisplay;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../settings.js":57}],59:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Settings.Gallery
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7410,9 +7378,8 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../settings.js":57}],60:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Settings.Playlist
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7431,6 +7398,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"> module.exports = Playlist;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../settings.js":57}],61:[function(require,module,exports){
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -7449,9 +7417,8 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./priority-list.js":52}],62:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Spinner
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7488,9 +7455,8 @@
</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 = Spinner;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./view.js":71}],63:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals Backbone, _ */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Toolbar
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7651,9 +7617,8 @@
</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 = Toolbar;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./button.js":33,"./priority-list.js":52,"./view.js":71}],64:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Toolbar.Embed
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7689,9 +7654,8 @@
</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 = Embed;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"./select.js":65}],65:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.Toolbar.Select
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7760,9 +7724,8 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../toolbar.js":63}],66:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Creates a dropzone on WP editor instances (elements with .wp-editor-wrap
</span><span class="cx" style="display: block; padding: 0 10px"> * or #wp-fullscreen-body) and relays drag'n'dropped files to a media workflow.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7980,9 +7943,8 @@
</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 = EditorUploader;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../view.js":71}],67:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.UploaderInline
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8113,9 +8075,8 @@
</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 = UploaderInline;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../view.js":71,"./status.js":69}],68:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.UploaderStatusError
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8133,9 +8094,8 @@
</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 = UploaderStatusError;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../view.js":71}],69:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.UploaderStatus
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8273,9 +8233,8 @@
</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 = UploaderStatus;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../view.js":71,"./status-error.js":68}],70:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals _, wp, jQuery */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.view.UploaderWindow
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8386,9 +8345,8 @@
</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 = UploaderWindow;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{"../view.js":71}],71:[function(require,module,exports){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/*globals wp */
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * wp.media.View
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8453,4 +8411,5 @@
</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 = View;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> },{}]},{},[17]);
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsmanifestjs"></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.manifest.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views.manifest.js 2015-02-09 12:35:38 UTC (rev 31384)
+++ trunk/src/wp-includes/js/media/views.manifest.js 2015-02-09 16:00:44 UTC (rev 31385)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,148 +1,145 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/* global _wpMediaViewsL10n, confirm, getUserSetting, setUserSetting */
-( function( $, _ ) {
- var l10n,
- media = wp.media;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+var media = wp.media,
+ $ = jQuery,
+ l10n;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- media.isTouchDevice = ( 'ontouchend' in document );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+media.isTouchDevice = ( 'ontouchend' in document );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Link any localized strings.
- l10n = media.view.l10n = typeof _wpMediaViewsL10n === 'undefined' ? {} : _wpMediaViewsL10n;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Link any localized strings.
+l10n = media.view.l10n = window._wpMediaViewsL10n || {};
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Link any settings.
- media.view.settings = l10n.settings || {};
- delete l10n.settings;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Link any settings.
+media.view.settings = l10n.settings || {};
+delete l10n.settings;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Copy the `post` setting over to the model settings.
- media.model.settings.post = media.view.settings.post;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Copy the `post` setting over to the model settings.
+media.model.settings.post = media.view.settings.post;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Check if the browser supports CSS 3.0 transitions
- $.support.transition = (function(){
- var style = document.documentElement.style,
- transitions = {
- WebkitTransition: 'webkitTransitionEnd',
- MozTransition: 'transitionend',
- OTransition: 'oTransitionEnd otransitionend',
- transition: 'transitionend'
- }, transition;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Check if the browser supports CSS 3.0 transitions
+$.support.transition = (function(){
+ var style = document.documentElement.style,
+ transitions = {
+ WebkitTransition: 'webkitTransitionEnd',
+ MozTransition: 'transitionend',
+ OTransition: 'oTransitionEnd otransitionend',
+ transition: 'transitionend'
+ }, transition;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- transition = _.find( _.keys( transitions ), function( transition ) {
- return ! _.isUndefined( style[ transition ] );
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ transition = _.find( _.keys( transitions ), function( transition ) {
+ return ! _.isUndefined( style[ transition ] );
+ });
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return transition && {
- end: transitions[ transition ]
- };
- }());
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return transition && {
+ end: transitions[ transition ]
+ };
+}());
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * A shared event bus used to provide events into
- * the media workflows that 3rd-party devs can use to hook
- * in.
- */
- media.events = _.extend( {}, Backbone.Events );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * A shared event bus used to provide events into
+ * the media workflows that 3rd-party devs can use to hook
+ * in.
+ */
+media.events = _.extend( {}, Backbone.Events );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Makes it easier to bind events using transitions.
- *
- * @param {string} selector
- * @param {Number} sensitivity
- * @returns {Promise}
- */
- media.transition = function( selector, sensitivity ) {
- var deferred = $.Deferred();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Makes it easier to bind events using transitions.
+ *
+ * @param {string} selector
+ * @param {Number} sensitivity
+ * @returns {Promise}
+ */
+media.transition = function( selector, sensitivity ) {
+ var deferred = $.Deferred();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sensitivity = sensitivity || 2000;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sensitivity = sensitivity || 2000;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $.support.transition ) {
- if ( ! (selector instanceof $) ) {
- selector = $( selector );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $.support.transition ) {
+ if ( ! (selector instanceof $) ) {
+ selector = $( selector );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Resolve the deferred when the first element finishes animating.
- selector.first().one( $.support.transition.end, deferred.resolve );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Resolve the deferred when the first element finishes animating.
+ selector.first().one( $.support.transition.end, deferred.resolve );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Just in case the event doesn't trigger, fire a callback.
- _.delay( deferred.resolve, sensitivity );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Just in case the event doesn't trigger, fire a callback.
+ _.delay( deferred.resolve, sensitivity );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Otherwise, execute on the spot.
- } else {
- deferred.resolve();
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Otherwise, execute on the spot.
+ } else {
+ deferred.resolve();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return deferred.promise();
- };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return deferred.promise();
+};
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- media.controller.Region = require( './controllers/region.js' );
- media.controller.StateMachine = require( './controllers/state-machine.js' );
- media.controller.State = require( './controllers/state.js' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+media.controller.Region = require( './controllers/region.js' );
+media.controller.StateMachine = require( './controllers/state-machine.js' );
+media.controller.State = require( './controllers/state.js' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- media.selectionSync = require( './utils/selection-sync.js' );
- media.controller.Library = require( './controllers/library.js' );
- media.controller.ImageDetails = require( './controllers/image-details.js' );
- media.controller.GalleryEdit = require( './controllers/gallery-edit.js' );
- media.controller.GalleryAdd = require( './controllers/gallery-add.js' );
- media.controller.CollectionEdit = require( './controllers/collection-edit.js' );
- media.controller.CollectionAdd = require( './controllers/collection-add.js' );
- media.controller.FeaturedImage = require( './controllers/featured-image.js' );
- media.controller.ReplaceImage = require( './controllers/replace-image.js' );
- media.controller.EditImage = require( './controllers/edit-image.js' );
- media.controller.MediaLibrary = require( './controllers/media-library.js' );
- media.controller.Embed = require( './controllers/embed.js' );
- media.controller.Cropper = require( './controllers/cropper.js' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+media.selectionSync = require( './utils/selection-sync.js' );
+media.controller.Library = require( './controllers/library.js' );
+media.controller.ImageDetails = require( './controllers/image-details.js' );
+media.controller.GalleryEdit = require( './controllers/gallery-edit.js' );
+media.controller.GalleryAdd = require( './controllers/gallery-add.js' );
+media.controller.CollectionEdit = require( './controllers/collection-edit.js' );
+media.controller.CollectionAdd = require( './controllers/collection-add.js' );
+media.controller.FeaturedImage = require( './controllers/featured-image.js' );
+media.controller.ReplaceImage = require( './controllers/replace-image.js' );
+media.controller.EditImage = require( './controllers/edit-image.js' );
+media.controller.MediaLibrary = require( './controllers/media-library.js' );
+media.controller.Embed = require( './controllers/embed.js' );
+media.controller.Cropper = require( './controllers/cropper.js' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- media.View = require( './views/view.js' );
- media.view.Frame = require( './views/view.js' );
- media.view.MediaFrame = require( './views/media-frame.js' );
- media.view.MediaFrame.Select = require( './views/frame/select.js' );
- media.view.MediaFrame.Post = require( './views/frame/post.js' );
- media.view.MediaFrame.ImageDetails = require( './views/frame/image-details.js' );
- media.view.Modal = require( './views/modal.js' );
- media.view.FocusManager = require( './views/focus-manager.js' );
- media.view.UploaderWindow = require( './views/uploader/window.js' );
- media.view.EditorUploader = require( './views/uploader/editor.js' );
- media.view.UploaderInline = require( './views/uploader/inline.js' );
- media.view.UploaderStatus = require( './views/uploader/status.js' );
- media.view.UploaderStatusError = require( './views/uploader/status-error.js' );
- media.view.Toolbar = require( './views/toolbar.js' );
- media.view.Toolbar.Select = require( './views/toolbar/select.js' );
- media.view.Toolbar.Embed = require( './views/toolbar/embed.js' );
- media.view.Button = require( './views/button.js' );
- media.view.ButtonGroup = require( './views/button-group.js' );
- media.view.PriorityList = require( './views/priority-list.js' );
- media.view.MenuItem = require( './views/menu-item.js' );
- media.view.Menu = require( './views/menu.js' );
- media.view.RouterItem = require( './views/router-item.js' );
- media.view.Router = require( './views/router.js' );
- media.view.Sidebar = require( './views/sidebar.js' );
- media.view.Attachment = require( './views/attachment.js' );
- media.view.Attachment.Library = require( './views/attachment/library.js' );
- media.view.Attachment.EditLibrary = require( './views/attachment/edit-library.js' );
- media.view.Attachments = require( './views/attachments.js' );
- media.view.Search = require( './views/search.js' );
- media.view.AttachmentFilters = require( './views/attachment-filters.js' );
- media.view.DateFilter = require( './views/attachment-filters/date.js' );
- media.view.AttachmentFilters.Uploaded = require( './views/attachment-filters/uploaded.js' );
- media.view.AttachmentFilters.All = require( './views/attachment-filters/all.js' );
- media.view.AttachmentsBrowser = require( './views/attachments/browser.js' );
- media.view.Selection = require( './views/selection.js' );
- media.view.Attachment.Selection = require( './views/attachment/selection.js' );
- media.view.Attachments.Selection = require( './views/attachments/selection.js' );
- media.view.Attachment.EditSelection = require( './views/attachment/edit-selection.js' );
- media.view.Settings = require( './views/settings.js' );
- media.view.Settings.AttachmentDisplay = require( './views/settings/attachment-display.js' );
- media.view.Settings.Gallery = require( './views/settings/gallery.js' );
- media.view.Settings.Playlist = require( './views/settings/playlist.js' );
- media.view.Attachment.Details = require( './views/attachment/details.js' );
- media.view.AttachmentCompat = require( './views/attachment-compat.js' );
- media.view.Iframe = require( './views/iframe.js' );
- media.view.Embed = require( './views/embed.js' );
- media.view.Label = require( './views/label.js' );
- media.view.EmbedUrl = require( './views/embed/url.js' );
- media.view.EmbedLink = require( './views/embed/link.js' );
- media.view.EmbedImage = require( './views/embed/image.js' );
- media.view.ImageDetails = require( './views/image-details.js' );
- media.view.Cropper = require( './views/cropper.js' );
- media.view.EditImage = require( './views/edit-image.js' );
- media.view.Spinner = require( './views/spinner.js' );
-
-}(jQuery, _));
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+media.View = require( './views/view.js' );
+media.view.Frame = require( './views/view.js' );
+media.view.MediaFrame = require( './views/media-frame.js' );
+media.view.MediaFrame.Select = require( './views/frame/select.js' );
+media.view.MediaFrame.Post = require( './views/frame/post.js' );
+media.view.MediaFrame.ImageDetails = require( './views/frame/image-details.js' );
+media.view.Modal = require( './views/modal.js' );
+media.view.FocusManager = require( './views/focus-manager.js' );
+media.view.UploaderWindow = require( './views/uploader/window.js' );
+media.view.EditorUploader = require( './views/uploader/editor.js' );
+media.view.UploaderInline = require( './views/uploader/inline.js' );
+media.view.UploaderStatus = require( './views/uploader/status.js' );
+media.view.UploaderStatusError = require( './views/uploader/status-error.js' );
+media.view.Toolbar = require( './views/toolbar.js' );
+media.view.Toolbar.Select = require( './views/toolbar/select.js' );
+media.view.Toolbar.Embed = require( './views/toolbar/embed.js' );
+media.view.Button = require( './views/button.js' );
+media.view.ButtonGroup = require( './views/button-group.js' );
+media.view.PriorityList = require( './views/priority-list.js' );
+media.view.MenuItem = require( './views/menu-item.js' );
+media.view.Menu = require( './views/menu.js' );
+media.view.RouterItem = require( './views/router-item.js' );
+media.view.Router = require( './views/router.js' );
+media.view.Sidebar = require( './views/sidebar.js' );
+media.view.Attachment = require( './views/attachment.js' );
+media.view.Attachment.Library = require( './views/attachment/library.js' );
+media.view.Attachment.EditLibrary = require( './views/attachment/edit-library.js' );
+media.view.Attachments = require( './views/attachments.js' );
+media.view.Search = require( './views/search.js' );
+media.view.AttachmentFilters = require( './views/attachment-filters.js' );
+media.view.DateFilter = require( './views/attachment-filters/date.js' );
+media.view.AttachmentFilters.Uploaded = require( './views/attachment-filters/uploaded.js' );
+media.view.AttachmentFilters.All = require( './views/attachment-filters/all.js' );
+media.view.AttachmentsBrowser = require( './views/attachments/browser.js' );
+media.view.Selection = require( './views/selection.js' );
+media.view.Attachment.Selection = require( './views/attachment/selection.js' );
+media.view.Attachments.Selection = require( './views/attachments/selection.js' );
+media.view.Attachment.EditSelection = require( './views/attachment/edit-selection.js' );
+media.view.Settings = require( './views/settings.js' );
+media.view.Settings.AttachmentDisplay = require( './views/settings/attachment-display.js' );
+media.view.Settings.Gallery = require( './views/settings/gallery.js' );
+media.view.Settings.Playlist = require( './views/settings/playlist.js' );
+media.view.Attachment.Details = require( './views/attachment/details.js' );
+media.view.AttachmentCompat = require( './views/attachment-compat.js' );
+media.view.Iframe = require( './views/iframe.js' );
+media.view.Embed = require( './views/embed.js' );
+media.view.Label = require( './views/label.js' );
+media.view.EmbedUrl = require( './views/embed/url.js' );
+media.view.EmbedLink = require( './views/embed/link.js' );
+media.view.EmbedImage = require( './views/embed/image.js' );
+media.view.ImageDetails = require( './views/image-details.js' );
+media.view.Cropper = require( './views/cropper.js' );
+media.view.EditImage = require( './views/edit-image.js' );
+media.view.Spinner = require( './views/spinner.js' );
</ins></span></pre>
</div>
</div>
</body>
</html>